diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-06-16 17:23:22 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-06-17 20:19:09 +0200 |
| commit | fc96c05922d1a42d0fbaaa02a67a31e69c667f84 (patch) | |
| tree | b0a1fd07d733888cbda0480439859e1af752ff17 /base/java-tools/bin | |
| parent | 502e9ee5eb52bda8cb5bdf4ac4ef1d32dbded98f (diff) | |
| download | pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.gz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.xz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.zip | |
Fixed Java dependency.
The code has been modified to use the JAVA_HOME path specified in
the pki.conf.
The spec file has been modified to depend specifically on OpenJDK
1.8.0 and to provide the default JAVA_HOME path for the pki.conf.
https://fedorahosted.org/pki/ticket/2363
Diffstat (limited to 'base/java-tools/bin')
| -rw-r--r-- | base/java-tools/bin/pki | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/java-tools/bin/pki b/base/java-tools/bin/pki index 88490f7da..c9170831b 100644 --- a/base/java-tools/bin/pki +++ b/base/java-tools/bin/pki @@ -70,6 +70,12 @@ class PKICLI(pki.cli.CLI): def execute_java(self, args, stdout=sys.stdout): + # read Java home + value = subprocess.check_output( + '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JAVA_HOME', + shell=True) + java_home = value.decode(sys.getfilesystemencoding()).strip() + # read RESTEasy library path value = subprocess.check_output( '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $RESTEASY_LIB', @@ -117,7 +123,7 @@ class PKICLI(pki.cli.CLI): ] cmd = [ - 'java', + java_home + '/bin/java', '-cp', ':'.join(classpath), '-Djava.util.logging.config.file=' + logging_config, |