Changeset 15128 in josm for trunk/linux
- Timestamp:
- 2019-05-28T02:23:26+02:00 (6 years ago)
- Location:
- trunk/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/linux/latest/usr/bin/josm-latest
r14110 r15128 15 15 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java" 16 16 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java" 17 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java" 17 18 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java" 18 19 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java" 20 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java" 19 21 else 20 22 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 50 52 JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS" 53 elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then 54 JAVA_OPTS="--add-modules java.scripting $JAVA_OPTS" 51 55 fi 52 56 set +e -
trunk/linux/tested/usr/bin/josm
r14110 r15128 15 15 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java" 16 16 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java" 17 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java" 17 18 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java" 18 19 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java" 20 JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java" 19 21 else 20 22 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 50 52 JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS" 53 elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then 54 JAVA_OPTS="--add-modules java.scripting $JAVA_OPTS" 51 55 fi 52 56 set +e
Note:
See TracChangeset
for help on using the changeset viewer.