diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-11 02:01:32 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-11 02:01:32 +0000 |
| commit | fd4fb4ad523253568fdd08f2f75726b7b4f605d9 (patch) | |
| tree | af9782cab58f37b2427d3080379115340537649a /pki/base/silent/scripts/pkisilent | |
| parent | f1529e8cb5c0e6802aaa459b392e269b1ff85494 (diff) | |
| download | pki-fd4fb4ad523253568fdd08f2f75726b7b4f605d9.tar.gz pki-fd4fb4ad523253568fdd08f2f75726b7b4f605d9.tar.xz pki-fd4fb4ad523253568fdd08f2f75726b7b4f605d9.zip | |
Bugzilla Bug #656733 - Standardize jar install location and jar names
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1719 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/silent/scripts/pkisilent')
| -rwxr-xr-x | pki/base/silent/scripts/pkisilent | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent index 3bceea407..6a310c3f7 100755 --- a/pki/base/silent/scripts/pkisilent +++ b/pki/base/silent/scripts/pkisilent @@ -66,12 +66,8 @@ if($OS eq "Linux") { $libpath="/usr/lib"; - $ENV{LD_LIBRARY_PATH} = "/usr/lib/java::" - . "/usr/lib/${PRODUCT}:" - . "/usr/lib/dirsec:" - . "/usr/lib/java/dirsec:" - . "/usr/lib/jvm/jre-1.5.0-ibm/lib/i386/:" - . "/usr/lib/jvm/jre-1.5.0-ibm/lib/i386/native_threads:" + $ENV{LD_LIBRARY_PATH} = "/usr/lib/osutil:" + . "/usr/lib/jss:" . "/usr/lib/:/lib/:" ; } @@ -79,14 +75,12 @@ if($OS eq "Linux") { $libpath="/usr/lib64"; - $ENV{LD_LIBRARY_PATH} = "/usr/lib/java:/usr/lib:/lib" - . "/usr/lib/${PRODUCT}:" - . "/usr/lib/dirsec:" - . "/usr/lib/java/dirsec:" - . "/usr/lib64/java:/usr/lib64:/lib64:" - . "/usr/lib64/${PRODUCT}:" - . "/usr/lib64/dirsec:" - . "/usr/lib64/java/dirsec:"; + $ENV{LD_LIBRARY_PATH} = "/usr/lib64/osutil:" + . "/usr/lib64/jss:" + . "/usr/lib64/:/lib64/:" + . "/usr/lib/osutil:" + . "/usr/lib/jss:" + . "/usr/lib/:/lib/:" ; } else { @@ -146,19 +140,18 @@ else print "libpath=$libpath\n"; -$ENV{CLASSPATH} = "/usr/share/java/silent.jar:" - . "/usr/lib/java/jss4.jar:" +$ENV{CLASSPATH} = "/usr/share/java/${PRODUCT}/pki-silent.jar:" + . "/usr/share/java/${PRODUCT}/pki-certsrv.jar:" + . "/usr/share/java/${PRODUCT}/pki-cmscore.jar:" + . "/usr/share/java/${PRODUCT}/pki-nsutil.jar:" + . "/usr/share/java/${PRODUCT}/pki-cmsutil.jar:" + . "/usr/share/java/${PRODUCT}/pki-tools.jar:" . "/usr/share/java/ldapjdk.jar:" - . "/usr/share/java/${PRODUCT}/certsrv.jar:" - . "/usr/share/java/${PRODUCT}/cmscore.jar:" - . "/usr/share/java/${PRODUCT}/nsutil.jar:" - . "/usr/share/java/${PRODUCT}/cmsutil.jar:" - . "/usr/share/java/pkitools.jar:" - . "/usr/share/java/cstools.jar:" - . "/usr/share/java/${PRODUCT}/cstools.jar:" - . "/usr/share/${PRODUCT}/classes:" - . "/usr/share/java/xml-commons-resolver.jar:" . "/usr/share/java/xerces-j2.jar:" + . "/usr/share/java/xml-commons-resolver.jar:" + . "/usr/lib/java/dirsec/jss4.jar:" + . "/usr/lib/java/jss4.jar:" + . "/usr/lib/java/dirsec/osutil.jar:" . "/usr/lib/java/osutil.jar:"; |