diff options
Diffstat (limited to 'base/java-tools')
4 files changed, 8 insertions, 8 deletions
diff --git a/base/java-tools/pki b/base/java-tools/pki index 582162010..27802410f 100755 --- a/base/java-tools/pki +++ b/base/java-tools/pki @@ -45,10 +45,10 @@ sub invalid_architecture() ## search order this command uses to find shared libraries. ## ############################################################################### -my $ARCHITECTURE=`uname -i`; +my $ARCHITECTURE=`arch`; chop( $ARCHITECTURE ); -if( $ARCHITECTURE eq "i386" ) { +if( $ARCHITECTURE eq "i686" ) { $libpath="/usr/lib"; $ENV{LD_LIBRARY_PATH} = "/usr/lib/jss:" diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index e9ff00553..267b9df2c 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` if [ "${OS}" = "Linux" ] ; then - ARCHITECTURE=`uname -i` + ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - if [ "${ARCHITECTURE}" = "i386" ] ; then + if [ "${ARCHITECTURE}" = "i686" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in index 811935ef4..06fac424d 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` if [ "${OS}" = "Linux" ] ; then - ARCHITECTURE=`uname -i` + ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - if [ "${ARCHITECTURE}" = "i386" ] ; then + if [ "${ARCHITECTURE}" = "i686" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in index e70b9ab34..8aeec252c 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -67,11 +67,11 @@ invalid_architecture() { OS=`uname -s` if [ "${OS}" = "Linux" ] ; then - ARCHITECTURE=`uname -i` + ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - if [ "${ARCHITECTURE}" = "i386" ] ; then + if [ "${ARCHITECTURE}" = "i686" ] ; then LD_LIBRARY_PATH=/usr/lib:/lib LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH |