diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2015-07-22 02:33:35 +0200 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2015-07-22 10:33:31 +0200 |
| commit | 604dfd33f4312786485c2ff9b5f2304ba9e23ea7 (patch) | |
| tree | 764d13846753e62fe9dfa57352d04c184b226bed /pkgs/tools/networking/i2p/i2p.patch | |
| parent | 6f5aa25e89209f29457bc6fd09643bee1370152b (diff) | |
| download | nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar.gz nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar.bz2 nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar.lz nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar.xz nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.tar.zst nixpkgs-604dfd33f4312786485c2ff9b5f2304ba9e23ea7.zip | |
i2p: 0.9.19 -> 0.9.20
Diffstat (limited to 'pkgs/tools/networking/i2p/i2p.patch')
| -rw-r--r-- | pkgs/tools/networking/i2p/i2p.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch new file mode 100644 index 00000000000..2ae6446ed28 --- /dev/null +++ b/pkgs/tools/networking/i2p/i2p.patch @@ -0,0 +1,39 @@ +--- a/installer/resources/runplain.sh ++++ b/installer/resources/runplain.sh +@@ -21,7 +21,7 @@ + + # Try using the Java binary that I2P was installed with. + # If it's not found, try looking in the system PATH. +-JAVA=$(which %JAVA_HOME/bin/java || which java) ++JAVA=%JAVA% + + if [ -z $JAVA ] || [ ! -x $JAVA ]; then + echo "Error: Cannot find java." >&2 +@@ -40,15 +40,4 @@ + export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true" + fi + JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt" +-( +- nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 +-) & +-PID=$! +- +-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then +- echo "I2P started [$PID]" >&2 +- echo $PID > "${I2PTEMP}/router.pid" +-else +- echo "I2P failed to start." >&2 +- exit 1 +-fi ++${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch +--- a/installer/resources/i2prouter ++++ b/installer/resources/i2prouter +@@ -49,7 +49,7 @@ + + # gettext - we look for it in the path + # fallback to echo is below, we can't set it to echo here. +-GETTEXT=$(which gettext > /dev/null 2>&1) ++GETTEXT=%gettext% + + # Where to install the systemd service + SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service" |