Mercurial > hg > icedtea-web
changeset 1504:047c7c709220
shell-launcher/launchers.sh.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 | Wed, 05 Sep 2018 18:59:54 +0200 |
| parents | 1e7642497ca2 |
| children | c7ec25fa7f31 |
| files | shell-launcher/launchers.sh.in |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/shell-launcher/launchers.sh.in Wed Sep 05 18:18:40 2018 +0200 +++ b/shell-launcher/launchers.sh.in Wed Sep 05 18:59:54 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@"