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

debian: refresh patch

Browse Source
This commit is contained in:
kytv
2013-06-06 17:14:44 +00:00
parent e1c68d22a3
commit 081b692736
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
debian/patches/0001-path-substitution.patch vendored
View File

@ -32,7 +32,7 @@ Debian wrapper.config to try to prevent confusion.
# #
# This software is the proprietary information of Tanuki Software. # This software is the proprietary information of Tanuki Software.
# You shall use it only in accordance with the terms of the # You shall use it only in accordance with the terms of the
@@ -24,16 +24,12 @@ @@ -24,21 +24,12 @@
# These settings can be modified to fit the needs of your application # These settings can be modified to fit the needs of your application
# Optimized for use with version 3.5.17 of the Wrapper. # Optimized for use with version 3.5.17 of the Wrapper.
@ -41,21 +41,26 @@ Debian wrapper.config to try to prevent confusion.
-# should have been replaced by the izpack installer. -# should have been replaced by the izpack installer.
-# If you did not run the installer, replace them with the appropriate paths. -# If you did not run the installer, replace them with the appropriate paths.
-I2P="%INSTALL_PATH" -I2P="%INSTALL_PATH"
-if [ "`uname -s`" == "Darwin" ]; then
- if [ -d "%USER_HOME/Library/Application Support" ]; then
- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
- else
- I2P_CONFIG_DIR="%USER_HOME/.i2p" - I2P_CONFIG_DIR="%USER_HOME/.i2p"
- fi
-else
- I2P_CONFIG_DIR="%USER_HOME/.i2p"
-fi
-I2PTEMP="%SYSTEM_java_io_tmpdir" -I2PTEMP="%SYSTEM_java_io_tmpdir"
-# PORTABLE installation:
-# Use the following instead.
-#I2PTEMP="%INSTALL_PATH"
+# Read config file if found +# Read config file if found
+[ -f /etc/default/i2p ] && . /etc/default/i2p +[ -f /etc/default/i2p ] && . /etc/default/i2p
+ +
+I2P="/usr/share/i2p" +I2P="/usr/share/i2p"
+I2P_CONFIG_DIR="$HOME/.i2p" +I2P_CONFIG_DIR="$HOME/.i2p"
+I2PTEMP="/tmp" +I2PTEMP="/tmp"
# PORTABLE installation:
# Application # Use the following instead.
APP_NAME="i2p" #I2PTEMP="%INSTALL_PATH"
@@ -61,8 +57,8 @@ @@ -69,8 +60,8 @@
#RUN_AS_USER= #RUN_AS_USER=
# Wrapper # Wrapper
@ -66,7 +71,7 @@ Debian wrapper.config to try to prevent confusion.
# Priority at which to run the wrapper. See "man nice" for valid priorities. # Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified. # nice is only used if a priority is specified.
@@ -167,48 +163,6 @@ @@ -175,48 +166,6 @@
# Workaround for Gentoo # Workaround for Gentoo
JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF") JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
@ -115,7 +120,7 @@ Debian wrapper.config to try to prevent confusion.
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
COMMAND="$FIXED_COMMAND" COMMAND="$FIXED_COMMAND"
@@ -920,9 +874,6 @@ @@ -928,9 +877,6 @@
# 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.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $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 $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@ -125,7 +130,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1046,9 +997,6 @@ @@ -1054,9 +1000,6 @@
# 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.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $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 $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@ -135,7 +140,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1785,7 +1733,7 @@ @@ -1793,7 +1736,7 @@
} }
showsetusermesg() { showsetusermesg() {
@ -144,7 +149,7 @@ Debian wrapper.config to try to prevent confusion.
} }
checkifstartingasroot() { checkifstartingasroot() {
@@ -1793,7 +1741,7 @@ @@ -1801,7 +1744,7 @@
echo "`gettext 'Running I2P as the root user is *not* recommended.'`" echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg showsetusermesg
echo echo
@ -153,7 +158,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1858,23 +1806,9 @@ @@ -1866,23 +1809,9 @@
status status
;; ;;