Changeset 15916 in josm

Timestamp:

2020-02-23T22:05:36+01:00 (5 years ago)

Author:

simon04

Message:

fix #18756 - Fix shellcheck warnings of shellscripts

Location:

trunk

Files:

• linux/latest/DEBIAN/postinst (modified) (1 diff)
• linux/latest/DEBIAN/postrm (modified) (1 diff)
• linux/latest/usr/bin/josm-latest (modified) (5 diffs)
• linux/tested/DEBIAN/postinst (modified) (1 diff)
• linux/tested/DEBIAN/postrm (modified) (1 diff)
• linux/tested/usr/bin/josm (modified) (5 diffs)
• scripts/optimize-images (modified) (1 diff)

trunk/linux/latest/DEBIAN/postinst

@@ -2 +2 @@
 set -e
 # Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
+if [ "$1" = "configure" ] && [ -x "$(which update-menus 2>/dev/null)" ]; then
         update-menus
 fi

trunk/linux/latest/DEBIAN/postrm

@@ -2 +2 @@
 set -e
 # Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
+if [ -x "$(which update-menus 2>/dev/null)" ]; then update-menus ; fi
 # End automatically added section

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

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Simple wrapper script used to start JOSM in Debian
 set -e
@@ -5 +5 @@
 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK.
 # Override to a specific one using $JAVACMD
-ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
+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`"
+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 \
-|| dpkg --get-selections 'openjdk-*-jre:$ARCH' | grep install$ > /dev/null ; then
+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"
@@ -38 +38 @@
 if [ -z "${JAVACMD}" ]; then
     for jcmd in $JAVA_CMDS; do
-        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+        if [ "z$ALTERNATIVE_JDK" = "z$(readlink -n -f "$jcmd")" ] && [ -z "${JAVACMD}" ]; then
             JAVACMD="$jcmd"
             break
@@ -47 +47 @@
 if [ -z "${JAVACMD}" ]; then
     for jcmd in $JAVA_CMDS; do
-        if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        if [ -x "$jcmd" ] && [ -z "${JAVACMD}" ]; then
             JAVACMD="$jcmd"
             break
@@ -56 +56 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm-latest." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
+    if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
-    elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then
+    elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
         JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
     fi
     set +e
     while true; do
-        $JAVACMD $JAVA_OPTS -jar /usr/share/josm-latest/josm-latest.jar "$@"
+        $JAVACMD "$JAVA_OPTS" -jar /usr/share/josm-latest/josm-latest.jar "$@"
         if [ "z$?" != "z9" ]; then
             break

trunk/linux/tested/DEBIAN/postinst

@@ -2 +2 @@
 set -e
 # Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
+if [ "$1" = "configure" ] && [ -x "$(which update-menus 2>/dev/null)" ]; then
         update-menus
 fi

trunk/linux/tested/DEBIAN/postrm

@@ -2 +2 @@
 set -e
 # Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
+if [ -x "$(which update-menus 2>/dev/null)" ]; then update-menus ; fi
 # End automatically added section

trunk/linux/tested/usr/bin/josm

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Simple wrapper script used to start JOSM in Debian
 set -e
@@ -5 +5 @@
 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK.
 # Override to a specific one using $JAVACMD
-ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
+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`"
+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 \
-|| dpkg --get-selections 'openjdk-*-jre:$ARCH' | grep install$ > /dev/null ; then
+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"
@@ -38 +38 @@
 if [ -z "${JAVACMD}" ]; then
     for jcmd in $JAVA_CMDS; do
-        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+        if [ "z$ALTERNATIVE_JDK" = "z$(readlink -n -f "$jcmd")" ] && [ -z "${JAVACMD}" ]; then
             JAVACMD="$jcmd"
             break
@@ -47 +47 @@
 if [ -z "${JAVACMD}" ]; then
     for jcmd in $JAVA_CMDS; do
-        if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        if [ -x "$jcmd" ] && [ -z "${JAVACMD}" ]; then
             JAVACMD="$jcmd"
             break
@@ -56 +56 @@
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm." || true
-    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
+    if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
-    elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then
+    elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
         JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
     fi
     set +e
     while true; do
-        $JAVACMD $JAVA_OPTS -jar /usr/share/josm/josm.jar "$@"
+        $JAVACMD "$JAVA_OPTS" -jar /usr/share/josm/josm.jar "$@"
         if [ "z$?" != "z9" ]; then
             break

trunk/scripts/optimize-images

@@ -1 +1 @@
 #!/bin/sh
 
-for x in $(find images/ -name "*.png"); do
-    echo "Processing ${x}"
-    optipng -o7 -quiet "${x}"
-done
+find images/ -name "*.png" \
+  -exec echo "Processing {}" \; \
+  -exec optipng -o7 -quiet "{}" \;