Changeset 8777 in josm for trunk/linux
- Timestamp:
- 2015-09-21T23:48:29+02:00 (9 years ago)
- Location:
- trunk/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/linux/latest/usr/bin/josm-latest
r8333 r8777 12 12 # If OpenJDK is only available headless, do not try it 13 13 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then 14 JAVA9_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" 14 15 JAVA8_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" 15 16 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java" 16 17 else 18 JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java" 17 19 JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java" 18 20 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" … … 45 47 done 46 48 49 for jcmd in $JAVA9_CMDS; do 50 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 51 JAVACMD="$jcmd" 52 fi 53 done 54 55 for jcmd in $JAVA9_CMDS; do 56 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 57 JAVACMD="$jcmd" 58 fi 59 done 60 47 61 if [ "$JAVACMD" ]; then 48 62 echo "Using $JAVACMD to execute josm-latest." || true -
trunk/linux/tested/usr/bin/josm
r8333 r8777 12 12 # If OpenJDK is only available headless, do not try it 13 13 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then 14 JAVA9_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" 14 15 JAVA8_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" 15 16 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java" 16 17 else 18 JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java" 17 19 JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java" 18 20 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" … … 45 47 done 46 48 49 for jcmd in $JAVA9_CMDS; do 50 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 51 JAVACMD="$jcmd" 52 fi 53 done 54 55 for jcmd in $JAVA9_CMDS; do 56 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 57 JAVACMD="$jcmd" 58 fi 59 done 60 47 61 if [ "$JAVACMD" ]; then 48 62 echo "Using $JAVACMD to execute josm." || true
Note:
See TracChangeset
for help on using the changeset viewer.