[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/0.0+svn27079+dfsg-3-gb313089

[Andrew Harvey]

The following commit has been merged in the master branch:
commit b313089f92964cfba079cb677aa572c1501e3cee
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sun Nov 20 13:29:51 2011 +1100

    use simpler wrapper script

diff --git a/debian/jmapviewer_demo.sh b/debian/jmapviewer_demo.sh
index 3e8e6e6..9d430dc 100644
--- a/debian/jmapviewer_demo.sh
+++ b/debian/jmapviewer_demo.sh
@@ -2,35 +2,5 @@
 # Simple wrapper script used to start JMapViewer_Demo 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`"
+java -Djava.net.useSystemProxies=true -jar /usr/share/jmapviewer/JMapViewer.jar "$@"
 
-# If OpenJDK 6 is only available headless, do not try it
-if dpkg --get-selections openjdk-6-jre | grep install$ > /dev/null ; then
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/bin/java"
-else
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java"
-fi
-
-JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.useSystemProxies=true"
-
-for jcmd in $JAVA_CMDS; do
-	if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-for jcmd in $JAVA_CMDS; do
-    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-        JAVACMD="$jcmd"
-    fi
-done
-
-if [ "$JAVACMD" ]; then
-    echo "Using $JAVACMD to execute JMapViewer_Demo."
-    exec $JAVACMD $JAVA_OPTS -jar /usr/share/jmapviewer/JMapViewer_Demo.jar "$@"
-else
-    echo "No valid JVM found to run JMapViewer_Demo."
-    exit 1
-fi

-- 
Java OpenStreetMap Tile Viewer