Changeset 8333 in josm for trunk/linux
- Timestamp:
- 2015-05-06T01:04:41+02:00 (10 years ago)
- Location:
- trunk/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/linux/latest/usr/bin/josm-latest
r8317 r8333 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 JAVA_CMDS="$JAVA_HOME/bin/java /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 /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" 14 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 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" 15 16 else 16 JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" 17 JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java" 18 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" 17 19 fi 18 20 19 21 JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS" 20 22 21 for jcmd in $JAVA _CMDS; do23 for jcmd in $JAVA8_CMDS; do 22 24 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 23 25 JAVACMD="$jcmd" … … 25 27 done 26 28 27 for jcmd in $JAVA_CMDS; do 29 for jcmd in $JAVA8_CMDS; do 30 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 31 JAVACMD="$jcmd" 32 fi 33 done 34 35 for jcmd in $JAVA7_CMDS; do 36 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 37 JAVACMD="$jcmd" 38 fi 39 done 40 41 for jcmd in $JAVA7_CMDS; do 28 42 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 29 43 JAVACMD="$jcmd" -
trunk/linux/tested/usr/bin/josm
r8317 r8333 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 JAVA_CMDS="$JAVA_HOME/bin/java /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 /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" 14 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 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" 15 16 else 16 JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" 17 JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java" 18 JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java" 17 19 fi 18 20 19 21 JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS" 20 22 21 for jcmd in $JAVA _CMDS; do23 for jcmd in $JAVA8_CMDS; do 22 24 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 23 25 JAVACMD="$jcmd" … … 25 27 done 26 28 27 for jcmd in $JAVA_CMDS; do 29 for jcmd in $JAVA8_CMDS; do 30 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 31 JAVACMD="$jcmd" 32 fi 33 done 34 35 for jcmd in $JAVA7_CMDS; do 36 if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then 37 JAVACMD="$jcmd" 38 fi 39 done 40 41 for jcmd in $JAVA7_CMDS; do 28 42 if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then 29 43 JAVACMD="$jcmd"
Note:
See TracChangeset
for help on using the changeset viewer.