Changeset 9066 in josm for trunk/linux


Ignore:
Timestamp:
2015-11-28T17:28:12+01:00 (4 years ago)
Author:
Don-vip
Message:

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

Location:
trunk/linux
Files:
2 edited

Legend:

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

    r8970 r9066  
    33set -e
    44
    5 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
     5# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
    66# Override to a specific one using $JAVACMD
    7 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
    8 
    97# Let's get the current architecture -- needed for multiarchified Java
    108ARCH="`dpkg --print-architecture 2> /dev/null || true`"
     
    2422
    2523JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
    26 
    27 if [ -z "${JAVACMD}" ]; then
    28     for jcmd in $JAVA_CMDS; do
    29         if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
    30             JAVACMD="$jcmd"
    31             break
    32         fi
    33     done
    34 fi
    3524
    3625if [ -z "${JAVACMD}" ]; then
  • trunk/linux/tested/usr/bin/josm

    r8970 r9066  
    33set -e
    44
    5 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
     5# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
    66# Override to a specific one using $JAVACMD
    7 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
    8 
    97# Let's get the current architecture -- needed for multiarchified Java
    108ARCH="`dpkg --print-architecture 2> /dev/null || true`"
     
    2422
    2523JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
    26 
    27 if [ -z "${JAVACMD}" ]; then
    28     for jcmd in $JAVA_CMDS; do
    29         if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
    30             JAVACMD="$jcmd"
    31             break
    32         fi
    33     done
    34 fi
    3524
    3625if [ -z "${JAVACMD}" ]; then
Note: See TracChangeset for help on using the changeset viewer.