Debian: Rework patch to work with the updated runplain.sh

debian/patches/0001-Update-paths.patch

@@ -9,8 +9,6 @@ Subject: Update-paths
  installer/resources/wrapper.config |   17 ++++++++---------
  4 files changed, 16 insertions(+), 17 deletions(-)
 
-diff --git a/installer/resources/eepget b/installer/resources/eepget
-index 080bcc8..f2e84ba 100644
 --- a/installer/resources/eepget
 +++ b/installer/resources/eepget
 @@ -1,3 +1,3 @@
@@ -18,8 +16,6 @@ index 080bcc8..f2e84ba 100644
 -I2P="%INSTALL_PATH"
 +I2P="/usr/share/i2p"
  java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
-diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
-index be6ef4f..8ebe059 100644
 --- a/installer/resources/i2prouter
 +++ b/installer/resources/i2prouter
 @@ -22,8 +22,8 @@
@@ -33,7 +29,7 @@ index be6ef4f..8ebe059 100644
  # PORTABLE installation:
  # Use the following instead.
  #I2PTEMP="%INSTALL_PATH"
-@@ -33,8 +33,8 @@ APP_NAME="i2p"
+@@ -33,8 +33,8 @@
  APP_LONG_NAME="I2P Service"
  
  # Wrapper
@@ -44,8 +40,6 @@ index be6ef4f..8ebe059 100644
  
  # Priority at which to run the wrapper.  See "man nice" for valid priorities.
  #  nice is only used if a priority is specified.
-diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
-index eaf2d29..e5530eb 100644
 --- a/installer/resources/runplain.sh
 +++ b/installer/resources/runplain.sh
 @@ -11,12 +11,12 @@
@@ -57,18 +51,16 @@ index eaf2d29..e5530eb 100644
 +I2P="/usr/share/i2p"
 +I2PTEMP="/tmp"
  
- export CP="$I2P" ; for j in "$I2P/lib/*"  ; do export CP="$CP:$j" ; done;
+ export CP="${I2P}" ; for j in "${I2P}/lib/*"  ; do export CP="${CP}:${j}" ; done;
  JAVA=java
  
--JAVAOPTS="-Djava.library.path=$I2P:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
-+JAVAOPTS="-Djava.library.path=/usr/lib/jni:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
- nohup $JAVA -cp "$CP" $JAVAOPTS net.i2p.router.RouterLaunch > /dev/null 2>&1 &
- echo $! > "$I2PTEMP/router.pid"
-diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
-index 380f94b..7bda095 100644
+-JAVAOPTS="-Djava.library.path=$ {I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
++JAVAOPTS="-Djava.library.path=/usr/lib/jni:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
+ nohup ${JAVA} -cp "${CP}" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 &
+ echo $! > "${I2PTEMP}/router.pid"
 --- a/installer/resources/wrapper.config
 +++ b/installer/resources/wrapper.config
-@@ -45,20 +45,19 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+@@ -45,20 +45,19 @@
  # classes, or all the classes of i2p.jar, are in a different directory).
  # Be sure there are no other duplicate classes.
  #
@@ -94,7 +86,7 @@ index 380f94b..7bda095 100644
  wrapper.java.additional.4.stripquotes=TRUE
  # Jetty says this is a security risk
  # Uncommenting this won't help as the router forces it to true
-@@ -116,7 +115,7 @@ wrapper.console.loglevel=INFO
+@@ -116,7 +115,7 @@
  # tell the router where to find the wrapper log
  # (change X to the next available number)
  # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
@@ -103,7 +95,7 @@ index 380f94b..7bda095 100644
  # PORTABLE installation:
  # Use the following instead. I2P will find the logfile here,
  # no need for a wrapper.java.additional line too.
-@@ -182,7 +181,7 @@ wrapper.use_system_time=false
+@@ -182,7 +181,7 @@
  # you should copy this file, change the location or file name,
  # and edit the i2prouter script to change the WRAPPER_CONF setting
  # to point to the new wrapper.config location.
@@ -112,7 +104,7 @@ index 380f94b..7bda095 100644
  # PORTABLE installation:
  # Use the following instead.
  #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
-@@ -196,7 +195,7 @@ wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
+@@ -196,7 +195,7 @@
  #
  # This means i2prouter looks for './i2p.pid'.
  # See comments above for wrapper.java.pidfile
@@ -121,4 +113,3 @@ index 380f94b..7bda095 100644
  # PORTABLE installation:
  # Use the following instead.
  #wrapper.pidfile=$INSTALL_PATH/i2p.pid
---