Changeset 15491 in josm

Timestamp:

2019-11-01T13:30:58+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18273 - fix jvm detection in linux startup script

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

@@ -10 +10 @@
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
 
+JAVA_CMDS="$JAVA_HOME/bin/java"
+
 # If OpenJDK is only available headless, do not try it
-if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-        JAVA_CMDS="$JAVA_HOME/bin/java"
+if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null \
+|| dpkg --get-selections 'openjdk-*-jre:$ARCH' | grep install$ > /dev/null ; then
         # LTS versions in decreased order
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
@@ -23 +25 @@
         # Development version
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
-else
-        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
 fi
+# Undetermined version
+JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java"
 
 if [ -f /etc/default/josm-latest ]; then

trunk/linux/tested/usr/bin/josm

@@ -10 +10 @@
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
 
+JAVA_CMDS="$JAVA_HOME/bin/java"
+
 # If OpenJDK is only available headless, do not try it
-if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-        JAVA_CMDS="$JAVA_HOME/bin/java"
+if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null \
+|| dpkg --get-selections 'openjdk-*-jre:$ARCH' | grep install$ > /dev/null ; then
         # LTS versions in decreased order
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
@@ -23 +25 @@
         # Development version
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
-else
-        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
 fi
+# Undetermined version
+JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java"
 
 if [ -f /etc/default/josm ]; then