Changeset 13700 in josm for trunk/linux


Ignore:
Timestamp:
2018-05-02T23:45:52+02:00 (15 months ago)
Author:
Don-vip
Message:

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

Location:
trunk/linux
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/linux/latest/usr/bin/josm-latest

    r12890 r13700  
    1414        JAVA_CMDS="$JAVA_HOME/bin/java"
    1515        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"
     16        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"
    1617        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"
     18        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"
    1719else
    1820        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
    1921        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
     22        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
    2023        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
     24        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
    2125fi
    2226
     
    4751if [ "$JAVACMD" ]; then
    4852    echo "Using $JAVACMD to execute josm-latest." || true
    49     if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
     53    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
    5054        JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
    5155    fi
  • trunk/linux/tested/usr/bin/josm

    r12890 r13700  
    1414        JAVA_CMDS="$JAVA_HOME/bin/java"
    1515        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"
     16        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"
    1617        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"
     18        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"
    1719else
    1820        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
    1921        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
     22        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java"
    2023        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
     24        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-oracle/bin/java"
    2125fi
    2226
     
    4751if [ "$JAVACMD" ]; then
    4852    echo "Using $JAVACMD to execute josm." || true
    49     if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
     53    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
    5054        JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
    5155    fi
Note: See TracChangeset for help on using the changeset viewer.