Changeset 13700 in josm for trunk

Timestamp:

2018-05-02T23:45:52+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15560, see #16047 - detect java 10/11 packages

Location:

trunk/linux

Files:

• latest/usr/bin/josm-latest (modified) (2 diffs)
• tested/usr/bin/josm (modified) (2 diffs)

trunk/linux/latest/usr/bin/josm-latest

@@ -14 +14 @@
         JAVA_CMDS="$JAVA_HOME/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
 else
         JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
 fi
 
@@ -47 +51 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm-latest." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+    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"
     fi

trunk/linux/tested/usr/bin/josm

@@ -14 +14 @@
         JAVA_CMDS="$JAVA_HOME/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java /usr/lib/jvm/java-11-oracle/bin/java"
 else
         JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
 fi
 
@@ -47 +51 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+    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"
     fi