Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap
Commits: 08be9b38 by Bas Couwenberg at 2020-04-09T18:07:16+02:00 Simplify launcher script. - - - - - 2 changed files: - debian/changelog - debian/mkgmap.sh Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +mkgmap (0.0.0+svn4475-2) UNRELEASED; urgency=medium + + * Simplify launcher script. + + -- Bas Couwenberg <[email protected]> Thu, 09 Apr 2020 18:07:01 +0200 + mkgmap (0.0.0+svn4475-1) unstable; urgency=medium * New upstream SVN snapshot. ===================================== debian/mkgmap.sh ===================================== @@ -1,32 +1,14 @@ #! /bin/sh # Simple wrapper script to execute mkgmap 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 "${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 -fi - -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 fi @@ -35,7 +17,7 @@ fi if [ "$JAVACMD" ]; then echo "Using $JAVACMD to execute mkgmap." - exec $JAVACMD -jar /usr/share/mkgmap/mkgmap.jar "$@" + exec "${JAVACMD}" -jar /usr/share/mkgmap/mkgmap.jar "$@" else echo "No valid JVM found to run mkgmap." exit 1 View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/commit/08be9b38ec0406adcd0fc1f68ce5c3a6f2734e29 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/commit/08be9b38ec0406adcd0fc1f68ce5c3a6f2734e29 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
