Changeset 9066 in josm for trunk/linux

Timestamp:

2015-11-28T17:28:12+01:00 (9 years ago)

Author:

Don-vip

Message:

see #11390 - drop support for ALTERNATIVE_JDK in Debian startup scripts

Location:

trunk/linux

Files:

• latest/usr/bin/josm-latest (modified) (2 diffs)
• tested/usr/bin/josm (modified) (2 diffs)

trunk/linux/latest/usr/bin/josm-latest

@@ -3 +3 @@
 set -e
 
-# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
+# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
 # Override to a specific one using $JAVACMD
-ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
-
 # Let's get the current architecture -- needed for multiarchified Java
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
@@ -24 +22 @@
 
 JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
-
-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
 
 if [ -z "${JAVACMD}" ]; then

trunk/linux/tested/usr/bin/josm

@@ -3 +3 @@
 set -e
 
-# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
+# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
 # Override to a specific one using $JAVACMD
-ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
-
 # Let's get the current architecture -- needed for multiarchified Java
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
@@ -24 +22 @@
 
 JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
-
-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
 
 if [ -z "${JAVACMD}" ]; then