The following commit has been merged in the master branch: commit 3fe1c65d2fdec11043ba71ac99c9700fae0dbe22 Author: Andrew Harvey <andrew.harv...@gmail.com> Date: Sun Nov 20 13:28:30 2011 +1100
use simpler wrapper script diff --git a/debian/osmembrane.sh b/debian/osmembrane.sh index ab4b535..cffa005 100644 --- a/debian/osmembrane.sh +++ b/debian/osmembrane.sh @@ -2,35 +2,5 @@ # Simple wrapper script used to start OSMembrane 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/osmembrane/osmembrane.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 OSMembrane." - exec $JAVACMD $JAVA_OPTS -jar /usr/share/osmembrane/osmembrane.jar "$@" -else - echo "No valid JVM found to run OSMembrane." - exit 1 -fi -- GUI front end for Osmosis _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits