Changeset 15128 in josm for trunk/linux/tested/usr

Timestamp:

2019-05-28T02:23:26+02:00 (5 years ago)

Author:

Don-vip

Message:

see #16047, see #16498, see #17516, fix #17723

• add java.scripting module when loading JOSM with Java 11+
• detect java 12/13 on Linux

File:

• trunk/linux/tested/usr/bin/josm (modified) (2 diffs)

trunk/linux/tested/usr/bin/josm

@@ -15 +15 @@
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
 else
         JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
@@ -49 +51 @@
     if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
+    elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then
+        JAVA_OPTS="--add-modules java.scripting $JAVA_OPTS"
     fi
     set +e