From 6849427b4fd59062d00d8ceb2eae883897c05e44 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Wed, 9 Nov 2011 18:30:21 +0000
Subject: [PATCH] *Sigh* The WRAPPER_CONF variable exists and I don't know why
I didn't use it before with my 'gentoo hack'.
---
debian/patches/0001-path-substitution.patch | 21 ---------------------
installer/resources/i2prouter | 9 +++++++--
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 38e94c9bd2..dcbce0253a 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -45,27 +45,6 @@ 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 @@
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 30b09ada54..83e3f68d80 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -131,15 +131,20 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper
# Do not modify anything beyond this point
#-----------------------------------------------------------------------------
+if [ -e $WRAPPER_CONF ]; then
+ echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
+ exit 1
+fi
+
# Workaround for Gentoo
-JAVABINARY=`grep ^wrapper\.java\.command $I2P/wrapper.config | cut -f2 -d=`
+JAVABINARY=`grep ^wrapper\.java\.command $WRAPPER_CONF | 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"
+ echo "Please set wrapper.java.command in $WRAPPER_CONF"
exit 1
fi
fi
--
GitLab