Changeset 18498 in josm

Timestamp:

2022-06-23T00:07:10+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix issues from checkbashisms introduced in r18497

Location:

trunk/native/linux

Files:

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

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

@@ -1 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 # Simple wrapper script used to start JOSM in Debian
-set -e
+set -ex
 
 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK.
@@ -37 +37 @@
 }
 
+java_version() {
+  ${1} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}' | cat
+}
+
 if [ -x "$(command -v dpkg)" ]; then
         dpkg_java
@@ -70 +74 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute ${JOSM_VERSION}." || true
-    JAVA_VERSION="$(${JAVACMD} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}')"
+    JAVA_VERSION=$(java_version ${JAVACMD})
     JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}"
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"

trunk/native/linux/tested/usr/bin/josm

@@ -37 +37 @@
 }
 
+java_version() {
+  ${1} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}' | cat
+}
+
 if [ -x "$(command -v dpkg)" ]; then
         dpkg_java
@@ -70 +74 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute ${JOSM_VERSION}." || true
-    JAVA_VERSION="$(${JAVACMD} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}')"
+    JAVA_VERSION=$(java_version ${JAVACMD})
     JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}"
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"