[patch] i2p-0.9.20_fix-paths.patch

i2p-0.9.20_fix-paths.patch (text/plain), 6.18 KB, created by Sergey S. Starikoff on 2015-06-06 15:06:16 UTC

diff -Naur i2p-0.9.20.orig/installer/resources/clients.config i2p-0.9.20/installer/resources/clients.config
--- i2p-0.9.20.orig/installer/resources/clients.config	2015-06-06 15:55:31.755853430 +0300
+++ i2p-0.9.20/installer/resources/clients.config	2015-06-06 15:56:39.552063712 +0300
@@ -60,7 +60,7 @@
 clientApp.4.name=Open Router Console in web browser at startup
 clientApp.4.args=http://127.0.0.1:7657/
 clientApp.4.delay=3
-clientApp.4.startOnLoad=true
+clientApp.4.startOnLoad=false
 
 # BOB bridge
 clientApp.5.args=
diff -Naur i2p-0.9.20.orig/installer/resources/eepget i2p-0.9.20/installer/resources/eepget
--- i2p-0.9.20.orig/installer/resources/eepget	2015-06-06 15:55:31.756853389 +0300
+++ i2p-0.9.20/installer/resources/eepget	2015-06-06 15:57:10.330797401 +0300
@@ -1,3 +1,3 @@
 #!/bin/sh
-I2P="%INSTALL_PATH"
+I2P="/usr/share/i2p"
 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
diff -Naur i2p-0.9.20.orig/installer/resources/i2prouter i2p-0.9.20/installer/resources/i2prouter
--- i2p-0.9.20.orig/installer/resources/i2prouter	2015-06-06 15:55:31.756853389 +0300
+++ i2p-0.9.20/installer/resources/i2prouter	2015-06-06 15:59:41.205591644 +0300
@@ -28,20 +28,19 @@
 # Note that (percent)INSTALL_PATH, (percent)USER_HOME,  and (percent)SYSTEM_java_io_tmpdir
 # should have been replaced by the izpack installer.
 # If you did not run the installer, replace them with the appropriate paths.
-I2P="%INSTALL_PATH"
+USER_HOME="$HOME"
+SYSTEM_java_io_tmpdir="/var/cache/i2p"
+I2P="/usr/share/i2p"
 if [ "`uname -s`" = "Darwin" ]; then
-   if [ -d "%USER_HOME/Library/Application Support" ]; then
-       I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
+   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"
+    I2P_CONFIG_DIR="$USER_HOME/.i2p"
 fi
-I2PTEMP="%SYSTEM_java_io_tmpdir"
-# PORTABLE installation:
-# Use the following instead.
-#I2PTEMP="%INSTALL_PATH"
+I2PTEMP="$SYSTEM_java_io_tmpdir"
 
 # Application
 APP_NAME="i2p"
diff -Naur i2p-0.9.20.orig/installer/resources/runplain.sh i2p-0.9.20/installer/resources/runplain.sh
--- i2p-0.9.20.orig/installer/resources/runplain.sh	2015-06-06 15:55:31.756853389 +0300
+++ i2p-0.9.20/installer/resources/runplain.sh	2015-06-06 16:00:15.354187392 +0300
@@ -11,8 +11,8 @@
 # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
 # should have been replaced by the izpack installer.
 # If you did not run the installer, replace them with the appropriate path.
-I2P="%INSTALL_PATH"
-I2PTEMP="%SYSTEM_java_io_tmpdir"
+I2P="/usr/share/i2p"
+I2PTEMP="$SYSTEM_java_io_tmpdir"
 
 # Having IPv6 enabled can cause problems with certain configurations. Changing the
 # next value to true may help.
diff -Naur i2p-0.9.20.orig/installer/resources/wrapper.config i2p-0.9.20/installer/resources/wrapper.config
--- i2p-0.9.20.orig/installer/resources/wrapper.config	2015-06-06 15:55:31.755853430 +0300
+++ i2p-0.9.20/installer/resources/wrapper.config	2015-06-06 16:02:46.689965552 +0300
@@ -60,21 +60,26 @@
 # classes, or all the classes of i2p.jar, are in a different directory).
 # Be sure there are no other duplicate classes.
 #
-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
+wrapper.java.classpath.2=/usr/share/jakarta-jstl/lib/*.jar
+wrapper.java.classpath.3=/usr/share/java-service-wrapper/lib/*.jar
+wrapper.java.classpath.4=/usr/share/bcprov/lib/*.jar
+
 #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
 # wrapper.java.classpath.2=%CLASSPATH%
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=$INSTALL_PATH
-wrapper.java.library.path.2=$INSTALL_PATH/lib
+wrapper.java.library.path.1=/usr/share/i2p
+wrapper.java.library.path.2=/usr/share/i2p/lib
+wrapper.java.library.path.3=/usr/lib/java-service-wrapper
 
 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
 wrapper.java.additional.auto_bits=TRUE
 
 # Java Additional Parameters
 # Numbers must be consecutive (except for stripquotes)
-wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
-wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
+wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt
+wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p"
 wrapper.java.additional.2.stripquotes=TRUE
 
 # Prevent the JVM from exporting stats (and thereby causing hundreds of
@@ -99,11 +104,11 @@
 # wrapper.java.additional.8=-Dorg.mortbay.util.FileResource.checkAliases=false
 # PORTABLE installation:
 # uncomment the following
-#wrapper.java.additional.3=-Di2p.dir.pid="$INSTALL_PATH"
+#wrapper.java.additional.3=-Di2p.dir.pid="/usr/share/i2p"
 #wrapper.java.additional.3.stripquotes=TRUE
-#wrapper.java.additional.4=-Di2p.dir.temp="$INSTALL_PATH"
+#wrapper.java.additional.4=-Di2p.dir.temp="/usr/share/i2p"
 #wrapper.java.additional.4.stripquotes=TRUE
-#wrapper.java.additional.5=-Di2p.dir.config="$INSTALL_PATH"
+#wrapper.java.additional.5=-Di2p.dir.config="/usr/share/i2p"
 #wrapper.java.additional.5.stripquotes=TRUE
 #
 # Uncomment this for better performance.
@@ -150,7 +155,7 @@
 # PORTABLE installation:
 # Use the following instead. I2P will find the logfile here,
 # no need for a wrapper.java.additional line too.
-#wrapper.logfile=$INSTALL_PATH/wrapper.log
+#wrapper.logfile=/usr/share/i2p/wrapper.log
 
 # Format of output for the log file.
 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
@@ -223,7 +228,7 @@
 #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
 # PORTABLE installation:
 # Use the following instead.
-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
+#wrapper.java.pidfile=/usr/share/i2p/routerjvm.pid
 # pid file for the service monitoring the JVM
 #
 # From i2prouter:
@@ -241,7 +246,7 @@
 #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
 # PORTABLE installation:
 # Use the following instead.
-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
+#wrapper.pidfile=/usr/share/i2p/i2p.pid
 
 #********************************************************************
 # Wrapper General Properties