diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:07:44 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:07:44 +0000 |
| commit | 551ac1bf0836ec7ee873be112fe2beb4fb799a5a (patch) | |
| tree | 7c420ef1a92c8a4692b8eb53bbb8ad004c4d6fae /pki/base/java-tools/templates | |
| parent | 8b7fac3f033143cd6bf53d94be8c398982a3af21 (diff) | |
| download | pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.gz pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.tar.xz pki-551ac1bf0836ec7ee873be112fe2beb4fb799a5a.zip | |
Bugzilla Bug #533233 - Remove "pki*" scripts from pki-native-tools . . .
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@812 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools/templates')
3 files changed, 21 insertions, 6 deletions
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper index 5fdf46622..d92bf3e6b 100644 --- a/pki/base/java-tools/templates/pki_java_command_wrapper +++ b/pki/base/java-tools/templates/pki_java_command_wrapper @@ -64,10 +64,10 @@ invalid_architecture() { ## search order this command wrapper uses to find shared libraries. ## ############################################################################### -OS=`pkiname` -ARCHITECTURE=`pkiarch` +OS=`uname -s` if [ "${OS}" = "Linux" ] ; then + ARCHITECTURE=`uname -i` JAVA="java" JAVA_OPTIONS="" @@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then exit 255 fi elif [ "${OS}" = "SunOS" ] ; then + ARCHITECTURE=`uname -p` + if [ "${ARCHITECTURE}" = "sparc" ] && + [ -d "/usr/lib/sparcv9/" ] ; then + ARCHITECTURE="sparcv9" + fi if [ "${ARCHITECTURE}" = "sparc" ] ; then JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java" JAVA_OPTIONS="" diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper index 9f014ceee..9caf5049d 100644 --- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper +++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper @@ -64,10 +64,10 @@ invalid_architecture() { ## search order this command wrapper uses to find shared libraries. ## ############################################################################### -OS=`pkiname` -ARCHITECTURE=`pkiarch` +OS=`uname -s` if [ "${OS}" = "Linux" ] ; then + ARCHITECTURE=`uname -i` JAVA="java" JAVA_OPTIONS="" @@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then exit 255 fi elif [ "${OS}" = "SunOS" ] ; then + ARCHITECTURE=`uname -p` + if [ "${ARCHITECTURE}" = "sparc" ] && + [ -d "/usr/lib/sparcv9/" ] ; then + ARCHITECTURE="sparcv9" + fi if [ "${ARCHITECTURE}" = "sparc" ] ; then JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java" JAVA_OPTIONS="" diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper index e8c82094a..ee91d7d2b 100644 --- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper +++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper @@ -64,10 +64,10 @@ invalid_architecture() { ## search order this command wrapper uses to find shared libraries. ## ############################################################################### -OS=`pkiname` -ARCHITECTURE=`pkiarch` +OS=`uname -s` if [ "${OS}" = "Linux" ] ; then + ARCHITECTURE=`uname -i` JAVA="java" JAVA_OPTIONS="" @@ -89,6 +89,11 @@ if [ "${OS}" = "Linux" ] ; then exit 255 fi elif [ "${OS}" = "SunOS" ] ; then + ARCHITECTURE=`uname -p` + if [ "${ARCHITECTURE}" = "sparc" ] && + [ -d "/usr/lib/sparcv9/" ] ; then + ARCHITECTURE="sparcv9" + fi if [ "${ARCHITECTURE}" = "sparc" ] ; then JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java" JAVA_OPTIONS="" |