Debian patch refresh and readme file update

This commit is contained in:
kytv
2013-11-02 17:31:31 +00:00
parent e23f3b4875
commit 67e242c441
2 changed files with 14 additions and 7 deletions

View File

@ -71,7 +71,14 @@ 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.
@@ -172,64 +163,6 @@
@@ -167,69 +158,13 @@
# Do not modify anything beyond this point
#-----------------------------------------------------------------------------
+JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
+
if [ ! -e "$WRAPPER_CONF" ]; then
echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
exit 1
fi
@ -136,7 +143,7 @@ Debian wrapper.config to try to prevent confusion.
if [ -n "$FIXED_COMMAND" ]
then
COMMAND="$FIXED_COMMAND"
@@ -940,7 +873,7 @@
@@ -940,7 +875,7 @@
# 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.20 $ADDITIONAL_PARA"
@ -145,7 +152,7 @@ Debian wrapper.config to try to prevent confusion.
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1
@@ -997,7 +930,6 @@
@@ -997,7 +932,6 @@
if [ "X$pid" = "X" ]
then
eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@ -153,7 +160,7 @@ Debian wrapper.config to try to prevent confusion.
else
eval echo ' running: PID:$pid'
fi
@@ -1800,7 +1732,7 @@
@@ -1800,7 +1734,7 @@
}
showsetusermesg() {
@ -162,7 +169,7 @@ Debian wrapper.config to try to prevent confusion.
}
checkifstartingasroot() {
@@ -1808,7 +1740,7 @@
@@ -1808,7 +1742,7 @@
echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg
echo
@ -171,7 +178,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1
fi
}
@@ -1873,24 +1805,10 @@
@@ -1873,24 +1807,10 @@
status
;;