patch refresh

This commit is contained in:
kytv
2013-11-13 01:03:19 +00:00
parent b53ed94e8f
commit 79b5d9748d

View File

@@ -143,7 +143,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"
@@ -940,7 +875,7 @@ @@ -944,7 +879,7 @@
# 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.20 $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.20 $ADDITIONAL_PARA"
@@ -152,7 +152,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
@@ -997,7 +932,6 @@ @@ -1001,7 +936,6 @@
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`" eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@@ -160,7 +160,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo ' running: PID:$pid' eval echo ' running: PID:$pid'
fi fi
@@ -1800,7 +1734,7 @@ @@ -1804,7 +1738,7 @@
} }
showsetusermesg() { showsetusermesg() {
@@ -169,7 +169,7 @@ Debian wrapper.config to try to prevent confusion.
} }
checkifstartingasroot() { checkifstartingasroot() {
@@ -1808,7 +1742,7 @@ @@ -1812,7 +1746,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
@@ -178,7 +178,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1873,24 +1807,10 @@ @@ -1877,24 +1811,10 @@
status status
;; ;;
@@ -317,7 +317,7 @@ Debian wrapper.config to try to prevent confusion.
@@ -255,30 +236,3 @@ @@ -255,30 +236,3 @@
wrapper.umask=0022 wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=077 wrapper.logfile.umask=0077
- -
-#******************************************************************** -#********************************************************************
-# Wrapper NT Service Properties -# Wrapper NT Service Properties