/hg/icedtea-web: shell-launcher/launchers.sh.in: inverted logic ...

[jvanek at icedtea.classpath.org]

changeset 047c7c709220 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=047c7c709220
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Sep 05 18:59:54 2018 +0200

	shell-launcher/launchers.sh.in: inverted logic to detect modular jdk. If it is jdk8, then it is not modular JDK, otherwise it is.


diffstat:

 shell-launcher/launchers.sh.in |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 1e7642497ca2 -r 047c7c709220 shell-launcher/launchers.sh.in
--- 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@"