fix stupid packaging error brought about by my tweaks for Gentoo.

This commit is contained in:
kytv
2011-11-08 21:00:41 +00:00
parent 6fc0e0fe22
commit c0a63bcd76

View File

@ -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 @@