zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '95d0c51104a5fdcaa83228fbf9016b66b6227600'

Browse Source 
and 'fb96ae6d12deead2b45984e33fcfeedb4641b3ac'
This commit is contained in:
zzz
2011-11-09 23:27:45 +00:00
parent 37e3e9e2cf 6849427b4f
commit 5b5c39bf45
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
installer/resources/i2prouter
View File

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