[med-svn] [beast2-mcmc] 01/01: Respect proxy settings in beauti2 script

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository beast2-mcmc.

commit f34014edb43eb004c821d5d836c7acd67abaad1c
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 15 13:06:15 2016 +0200

    Respect proxy settings in beauti2 script
---
 debian/bin/beauti2 | 17 ++++++++++++++++-
 debian/changelog   |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/bin/beauti2 b/debian/bin/beauti2
index 506c9ba..78918cf 100644
--- a/debian/bin/beauti2
+++ b/debian/bin/beauti2
@@ -27,10 +27,25 @@ else
    TEMPLATE="-template ${BEAST_LIB}/templates/Standard.xml"
 fi
 
+if [ "$https_proxy" != "" ] ; then
+   HTTPSPROXYHOST=`echo $https_proxy | sed -e 's?^https*:/*??' -e 's/:[0-9]*//'`
+   HTTPSPROXYPORT=`echo $https_proxy | sed -e 's/^.*:\([0-9]\+\)$/\1/'`
+   SETHTTPS="-Dhttps.proxyHost=${HTTPSPROXYHOST} -Dhttps.proxyPort=${HTTPSPROXYPORT}"
+fi
+
+if [ "$http_proxy" != "" ] ; then
+   HTTPPROXYHOST=`echo $http_proxy | sed -e 's?^http:/*??' -e 's/:[0-9]*//'`
+   HTTPPROXYPORT=`echo $http_proxy | sed -e 's/^.*:\([0-9]\+\)$/\1/'`
+   SETHTTP="-Dhttp.proxyHost=${HTTPPROXYHOST} -Dhttp.proxyPort=${HTTPPROXYPORT}"
+   if [ "$SETHTTPS" = "" ] ; then
+      SETHTTPS="-Dhttps.proxyHost=${HTTPPROXYHOST} -Dhttps.proxyPort=${HTTPPROXYPORT}"
+   fi
+fi
+
 BEAST_LIB="/usr/share/beast-mcmc2"
 DEBJAR="/usr/share/java"
 JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
-${JAVA_HOME}/bin/java -Xms64m -Xmx${MAXMEM}m -Djava.library.path="$BEAST_LIB" \
+${JAVA_HOME}/bin/java -Xms64m -Xmx${MAXMEM}m -Djava.library.path="$BEAST_LIB" $SETHTTP $SETHTTPS \
    -classpath "${CLASSPATH}:${DEBJAR}/jebl.jar:${DEBJAR}/jam.jar:${DEBJAR}/jdom1.jar:${DEBJAR}/colt.jar:${DEBJAR}/commons-math.jar:${BEAST_LIB}/beast.jar:$BEAST_LIB/launcher.jar" \
    beast.app.beauti.BeautiLauncher \
    ${TEMPLATE} $*
diff --git a/debian/changelog b/debian/changelog
index ea410de..7126c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 beast2-mcmc (2.4.1+dfsg-2) UNRELEASED; urgency=medium
 
   * Fix beauti2 script
+  * Respect proxy settings in beauti2 script
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jul 2016 11:19:53 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beast2-mcmc.git