Mercurial > hg > release > icedtea-web-1.7
changeset 1488:caad90b359d8
launcher/launchers.in: inverted logic to detect modular jdk. If it is jdk8, then it is not modular JDK, otherwise it is.
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 10 Sep 2018 17:42:38 +0200 |
| parents | 723ab7fdbc59 |
| children | 5adcd54e9d3b |
| files | ChangeLog launcher/launchers.in |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 10 17:38:48 2018 +0200 +++ b/ChangeLog Mon Sep 10 17:42:38 2018 +0200 @@ -1,3 +1,8 @@ +2018-09-05 Jiri Vanek <jvanek@redhat.com> + + * launcher/launchers.in: inverted logic to detect modular jdk. + If it is jdk8, then it is not modular JDK, otherwise it is. + 2018-08-13 Jiri Vanek <jvanek@redhat.com> * LICENSE: new file. Added explicit license with details
--- a/launcher/launchers.in Mon Sep 10 17:38:48 2018 +0200 +++ b/launcher/launchers.in Mon Sep 10 17:42:38 2018 +0200 @@ -37,9 +37,9 @@ LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:@JRE@/$NASHORN" fi; -JDK9="NO" -if ${JAVA} -version 2>&1 | grep -q "version \"9-" ; then - JDK9="YES" +MODULAR_JDK="YES" +if ${JAVA} -version 2>&1 | grep -q "version \"1.8.0" ; then + MODULAR_JDK="NO" fi JAVA_ARGS=( ) @@ -82,7 +82,7 @@ COMMAND[k]="${LAUNCHER_FLAGS}" k=$((k+1)) -if [ "x$JDK9" == "xYES" ] ; then +if [ "x$MODULAR_JDK" == "xYES" ] ; then COMMAND[k]="--patch-module" k=$((k+1)) COMMAND[k]="java.desktop=@PLUGIN_JAR@:@NETX_JAR@"