diff options
Diffstat (limited to 'base/java-tools')
| -rw-r--r-- | base/java-tools/bin/pki | 34 | ||||
| -rw-r--r-- | base/java-tools/templates/pki_java_command_wrapper.in | 19 | ||||
| -rw-r--r-- | base/java-tools/templates/pretty_print_cert_command_wrapper.in | 15 | ||||
| -rw-r--r-- | base/java-tools/templates/pretty_print_crl_command_wrapper.in | 15 |
4 files changed, 2 insertions, 81 deletions
diff --git a/base/java-tools/bin/pki b/base/java-tools/bin/pki index 0bba06efb..152bf3f62 100644 --- a/base/java-tools/bin/pki +++ b/base/java-tools/bin/pki @@ -25,30 +25,6 @@ import sys def run_java_cli(args): - # construct libpath based on the architecture - arch = subprocess.check_output('arch') - arch = arch.strip() - - if arch == 'i686': - libpath = [ - '/usr/lib/jss', - '/usr/lib', - '/lib' - ] - - elif arch == 'x86_64': - libpath = [ - '/usr/lib64/jss', - '/usr/lib64', - '/lib64', - '/usr/lib/jss', - '/usr/lib', - '/lib' - ] - - else: - raise Exception('Unsupported architecture: ' + arch) - # read RESTEasy library path value = subprocess.check_output( '. /etc/pki/pki.conf && echo $RESTEASY_LIB', @@ -85,18 +61,12 @@ def run_java_cli(args): '/usr/share/java/pki/pki-cmsutil.jar', '/usr/share/java/pki/pki-certsrv.jar', '/usr/share/java/pki/pki-tools.jar', + '/usr/lib64/java/jss4.jar', + '/usr/lib/java/jss4.jar' ] - if arch == 'i686': - classpath.append('/usr/lib/java/jss4.jar') - - elif arch == 'x86_64': - classpath.append('/usr/lib64/java/jss4.jar') - classpath.append('/usr/lib/java/jss4.jar') - command = [ 'java', - '-Djava.library.path=' + (':'.join(libpath)), '-cp', ':'.join(classpath), 'com.netscape.cmstools.cli.MainCLI' diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in index 09e059edb..404bcf0a1 100644 --- a/base/java-tools/templates/pki_java_command_wrapper.in +++ b/base/java-tools/templates/pki_java_command_wrapper.in @@ -70,25 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "armv7l" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && 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 3a67e3a2a..6c1abc7a1 100644 --- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in @@ -70,21 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && 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 900a887cc..19f8bd8d0 100644 --- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in +++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in @@ -70,21 +70,6 @@ if [ "${OS}" = "Linux" ] ; then ARCHITECTURE=`arch` JAVA="java" JAVA_OPTIONS="" - - if [ "${ARCHITECTURE}" = "i686" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - elif [ "${ARCHITECTURE}" = "x86_64" ] ; then - LD_LIBRARY_PATH=/usr/lib:/lib - LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH} - LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH - else - invalid_architecture "${ARCHITECTURE}" - exit 255 - fi elif [ "${OS}" = "SunOS" ] ; then ARCHITECTURE=`uname -p` if [ "${ARCHITECTURE}" = "sparc" ] && |