diff options
| author | Ade Lee <alee@redhat.com> | 2014-01-03 11:41:02 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-01-08 17:35:00 -0500 |
| commit | cc831a6be57a868cd36d15335eb0f65e77779c55 (patch) | |
| tree | 623327b4a933ad8fe004dc59fc678e12a8001e95 /base/java-tools | |
| parent | 68819722a5d08e6e6eea29846e879cc7ab65eb44 (diff) | |
| download | pki-cc831a6be57a868cd36d15335eb0f65e77779c55.tar.gz pki-cc831a6be57a868cd36d15335eb0f65e77779c55.tar.xz pki-cc831a6be57a868cd36d15335eb0f65e77779c55.zip | |
Debian - replace arch specification
uname -i returns "unknown" on a debian system. "arch" on the other
hand works for fedora, rhel and debian. Replacing these for all
packages except for the migration ones which will not be built on debian
in any case.
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 |