Changeset 8970 in josm for trunk/linux/tested

Timestamp:

2015-10-30T16:43:47+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12033 - Linux: Simplify java alternatives testing in startup scripts (patch by sebastic)

File:

• trunk/linux/tested/usr/bin/josm (modified) (1 diff)

trunk/linux/tested/usr/bin/josm

@@ -12 +12 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-        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"
-        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"
-        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"
+        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-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-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"
 else
-        JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
-        JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
-        JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
+        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-7-oracle/bin/java"
+        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
 fi
 
 JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
-for jcmd in $JAVA8_CMDS; do
-        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
+if [ -z "${JAVACMD}" ]; then
+    for jcmd in $JAVA_CMDS; do
+        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+            JAVACMD="$jcmd"
+            break
+        fi
+    done
+fi
 
-for jcmd in $JAVA8_CMDS; do
-    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-for jcmd in $JAVA7_CMDS; do
-        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-for jcmd in $JAVA7_CMDS; do
-    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-for jcmd in $JAVA9_CMDS; do
-        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-for jcmd in $JAVA9_CMDS; do
-    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
+if [ -z "${JAVACMD}" ]; then
+    for jcmd in $JAVA_CMDS; do
+        if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+            JAVACMD="$jcmd"
+            break
+        fi
+    done
+fi
 
 if [ "$JAVACMD" ]; then