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

Gentoo compatibility

Browse Source 
Update i2prouter to be more compatible with Gentoo systems and add a commented out entry to wrapper.config
This commit is contained in:
kytv
2011-11-02 00:05:51 +00:00
parent 1c0554ab6e
commit 32a4ccc575
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
history.txt
View File

@ -1,3 +1,7 @@
2011-11-01 kytv
* Update Ukrainian translations from Transifex
* Update i2prouter script for better compatibility with Gentoo
2011-10-31 zzz 2011-10-31 zzz
* NetDB: Reduce max RI publish interval * NetDB: Reduce max RI publish interval
* ProfileOrganizer: * ProfileOrganizer:

18
installer/resources/i2prouter
View File

@ -131,6 +131,20 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper
# Do not modify anything beyond this point # 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
WRAPPER_URL="http://www.i2p2.de/manualwrapper" WRAPPER_URL="http://www.i2p2.de/manualwrapper"
unsupported() { unsupported() {
echo "The most likely reason is that a supported version of the java" echo "The most likely reason is that a supported version of the java"
@ -840,7 +854,7 @@ console() {
prepAdditionalParams "$@" prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
failed failed
@ -965,7 +979,7 @@ start() {
prepAdditionalParams "$@" prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
failed failed

2
installer/resources/wrapper.config
View File

@ -31,6 +31,8 @@ wrapper.java.command=java
# Specify a specific java binary: # Specify a specific java binary:
#set.JAVA_HOME=/java/path #set.JAVA_HOME=/java/path
#wrapper.java.command=%JAVA_HOME%/bin/java #wrapper.java.command=%JAVA_HOME%/bin/java
# Gentoo uses the following:
#wrapper.java.command=/etc/java-config-2/current-system-vm/bin/java
# Tell the Wrapper to log the full generated Java command line. # Tell the Wrapper to log the full generated Java command line.
#wrapper.java.command.loglevel=INFO #wrapper.java.command.loglevel=INFO