I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 67e242c4 authored by kytv's avatar kytv
Browse files

Debian patch refresh and readme file update

parent e23f3b48
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. ...@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
The Glassfish JSP 2.1 bundled in Jetty 6 is way too old. The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
Retrieved from the file Retrieved from the file
apache-tomcat-6.0.36-deployer.tar.gz apache-tomcat-6.0.37-deployer.tar.gz
minus the following files and directores: minus the following files and directores:
......
...@@ -71,7 +71,14 @@ Debian wrapper.config to try to prevent confusion. ...@@ -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. # 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.
@@ -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 exit 1
fi fi
...@@ -136,7 +143,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -136,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 +873,7 @@ @@ -940,7 +875,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"
...@@ -145,7 +152,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -145,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 +930,6 @@ @@ -997,7 +932,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.'`"
...@@ -153,7 +160,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -153,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 +1732,7 @@ @@ -1800,7 +1734,7 @@
} }
showsetusermesg() { showsetusermesg() {
...@@ -162,7 +169,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -162,7 +169,7 @@ Debian wrapper.config to try to prevent confusion.
} }
checkifstartingasroot() { checkifstartingasroot() {
@@ -1808,7 +1740,7 @@ @@ -1808,7 +1742,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
...@@ -171,7 +178,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -171,7 +178,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1873,24 +1805,10 @@ @@ -1873,24 +1807,10 @@
status status
;; ;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment