Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmapgui
Commits: e08cd75a by Bas Couwenberg at 2020-04-09T18:21:25+02:00 Simplify launcher script. - - - - - 2 changed files: - debian/changelog - debian/mkgmapgui.sh Changes: ===================================== debian/changelog ===================================== @@ -3,6 +3,7 @@ mkgmapgui (1.1.ds-11) UNRELEASED; urgency=medium * Bump Standards-Version to 4.5.0, no changes. * Update gbp.conf to use --source-only-changes by default. * Bump debhelper compat to 10. + * Simplify launcher script. -- Bas Couwenberg <[email protected]> Tue, 25 Dec 2018 22:39:43 +0100 ===================================== debian/mkgmapgui.sh ===================================== @@ -1,53 +1,27 @@ #!/bin/sh # Simple wrapper script used to start mkgmapgui in Debian -set -e - -# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Sun's proprietary JDK. -# 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`" -# If OpenJDK is only available headless, do not try it -if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then - 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_CMDS} /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java" -else - JAVA_CMDS="$JAVA_HOME/bin/java" - JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-6-sun/bin/java" -fi +set -e -if [ -z "$JAVA_OPTS" -o $(echo "$JAVA_OPTS" | grep "\-Xmx" | wc -l) -eq 0 ]; then - JAVA_OPTS="$JAVA_OPTS -Xmx512M" -fi +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 +if [ -z "${JAVA_OPTS}" ] || [ "$(echo "${JAVA_OPTS}" | grep -c '\-Xmx')" -eq 0 ]; then + JAVA_OPTS="${JAVA_OPTS} -Xmx512M" 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 mkgmapgui." - exec $JAVACMD $JAVA_OPTS -jar /usr/share/mkgmapgui/mkgmapgui.jar /usr/share/mkgmap/mkgmap.jar +if [ "${JAVACMD}" ]; then + echo "Using ${JAVACMD} to execute mkgmapgui." + exec "${JAVACMD}" $JAVA_OPTS -jar /usr/share/mkgmapgui/mkgmapgui.jar /usr/share/mkgmap/mkgmap.jar else echo "No valid JVM found to run mkgmapgui." exit 1 View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmapgui/-/commit/e08cd75ac22d8a2b6062e2e51cfc95f82eae5b33 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmapgui/-/commit/e08cd75ac22d8a2b6062e2e51cfc95f82eae5b33 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
