[Git][debian-gis-team/mkgmap-splitter][master] Simplify launcher script.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap-splitter


Commits:
202d3db0 by Bas Couwenberg at 2020-04-09T18:14:01+02:00
Simplify launcher script.

- - - - -


2 changed files:

- debian/changelog
- debian/mkgmap-splitter.sh


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ mkgmap-splitter (0.0.0+svn597-2) UNRELEASED; urgency=medium
 
   * Bump debhelper compat to 10, changes:
     - Drop --parallel option, enabled by default
+  * Simplify launcher script.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 19 Mar 2020 19:37:48 +0100
 


=====================================
debian/mkgmap-splitter.sh
=====================================
@@ -1,45 +1,27 @@
 #!/bin/sh
 # Simple wrapper script used to start mkgmap-splitter in Debian
-set -e
-
-# Override to a specific one using $JAVACMD
-ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
 
-# Let's get the current architecture -- needed for multiarchified Java
-ARCH="`dpkg --print-architecture`"
+set -e
 
-JAVA_CMDS="$JAVA_HOME/bin/java"
-JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
-JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
-JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
-JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
+JAVA_CMDS="${JAVA_HOME}/bin/java"
 JAVA_CMDS="${JAVA_CMDS} /usr/bin/java"
 
-if [ -z "$JAVA_OPTS" -o $(echo "$JAVA_OPTS" | grep "\-Xmx" | wc -l) -eq 0 ]; then
-   JAVA_OPTS="$JAVA_OPTS -Xmx2000m"
-fi
-
-if [ -z "${JAVACMD}" ]; then
-    for jcmd in $JAVA_CMDS; do
-       if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-          JAVACMD="$jcmd"
-          break
-       fi
-    done
+if [ -z "${JAVA_OPTS}" ] || [ "$(echo "${JAVA_OPTS}" | grep -c '\-Xmx')" -eq 0 ]; then
+   JAVA_OPTS="${JAVA_OPTS} -Xmx2000m"
 fi
 
 if [ -z "${JAVACMD}" ]; then
-    for jcmd in $JAVA_CMDS; do
-       if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+    for jcmd in ${JAVA_CMDS}; do
+       if [ -x "$jcmd" ] && [ -z "${JAVACMD}" ]; then
           JAVACMD="$jcmd"
           break
        fi
     done
 fi
 
-if [ "$JAVACMD" ]; then
-   echo "Using $JAVACMD to execute mkgmap-splitter."
-   exec $JAVACMD $JAVA_OPTS -jar /usr/share/mkgmap-splitter/splitter.jar "$@"
+if [ "${JAVACMD}" ]; then
+   echo "Using ${JAVACMD} to execute mkgmap-splitter."
+   exec "${JAVACMD}" ${JAVA_OPTS} -jar /usr/share/mkgmap-splitter/splitter.jar "$@"
 else
    echo "No valid JVM found to run mkgmap-splitter."
    exit 1



View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/202d3db005b09be3c61149f9989dc4bc42b84aa0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/commit/202d3db005b09be3c61149f9989dc4bc42b84aa0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200409/8fb1d96a/attachment-0001.html>