diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index dcbce0253a5c0517710293afe9374769d1bc2544..38e94c9bd283107d9300eb46edbb4947712255fc 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -45,6 +45,27 @@ Debian wrapper.config to try to prevent confusion. # Priority at which to run the wrapper. See "man nice" for valid priorities. # nice is only used if a priority is specified. +@@ -131,19 +131,7 @@ + + # Do not modify anything beyond this point + #----------------------------------------------------------------------------- +-# Workaround for Gentoo +-JAVABINARY=`grep ^wrapper\.java\.command $I2P/wrapper.config | cut -f2 -d=` +- +-if [ -e /etc/gentoo-release ]; then +- if [ $JAVABINARY = java ]; then +- if [ -x /etc/java-config-2/current-system-vm/bin/java ]; then +- JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" +- else +- echo "Please set wrapper.java.command in $I2P/wrapper.config" +- exit 1 +- fi +- fi +-fi ++JAVABINARY="java" + + WRAPPER_URL="http://www.i2p2.de/manualwrapper" + unsupported() { --- a/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh @@ -11,8 +11,8 @@