[josm] 01/02: Add patch to fix bashism in josm launcher.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit bbf5ab3c5bf765abd03ca00e44a53a4f363451c5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 3 19:42:35 2017 +0200

    Add patch to fix bashism in josm launcher.
---
 debian/changelog              |  6 ++++++
 debian/patches/bashisms.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8ea0e42..1da41ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn12712+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add patch to fix bashism in josm launcher.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Sep 2017 19:42:14 +0200
+
 josm (0.0.svn12712+dfsg-1) unstable; urgency=medium
 
   * New tested snapshot.
diff --git a/debian/patches/bashisms.patch b/debian/patches/bashisms.patch
new file mode 100644
index 0000000..cb5eb8c
--- /dev/null
+++ b/debian/patches/bashisms.patch
@@ -0,0 +1,26 @@
+Description: Fix bashism, pattern match only works with bash as /bin/sh.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://josm.openstreetmap.de/ticket/15233
+
+--- a/linux/tested/usr/bin/josm
++++ b/linux/tested/usr/bin/josm
+@@ -46,7 +46,7 @@ fi
+ 
+ if [ "$JAVACMD" ]; then
+     echo "Using $JAVACMD to execute josm." || true
+-    if [[ $JAVACMD == *"java-9"* ]]; then
++    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+         JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
+     fi
+     set +e
+--- a/linux/latest/usr/bin/josm-latest
++++ b/linux/latest/usr/bin/josm-latest
+@@ -46,7 +46,7 @@ fi
+ 
+ if [ "$JAVACMD" ]; then
+     echo "Using $JAVACMD to execute josm-latest." || true
+-    if [[ $JAVACMD == *"java-9"* ]]; then
++    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then
+         JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
+     fi
+     set +e
diff --git a/debian/patches/series b/debian/patches/series
index 0e16b21..2e1cc81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+bashisms.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git