tjh.dev
1diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
2index 365737d89..2ea14db3e 100644
3--- a/installer/resources/i2prouter
4+++ b/installer/resources/i2prouter
5@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
6
7 # gettext - we look for it in the path
8 # fallback to echo is below, we can't set it to echo here.
9-GETTEXT=$(which gettext > /dev/null 2>&1)
10+GETTEXT=%gettext%
11
12 # Where to install the systemd service
13 SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
14diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
15index eb4995dfe..0186cede3 100644
16--- a/installer/resources/runplain.sh
17+++ b/installer/resources/runplain.sh
18@@ -25,7 +25,7 @@ CP=
19
20 # Try using the Java binary that I2P was installed with.
21 # If it's not found, try looking in the system PATH.
22-JAVA=$(which "%JAVA_HOME"/bin/java || which java)
23+JAVA=%JAVA%
24
25 if [ -z $JAVA ] || [ ! -x $JAVA ]; then
26 echo "Error: Cannot find java." >&2
27@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
28 export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
29 fi
30 JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
31-(
32- nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
33-) &
34-PID=$!
35-
36-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then
37- echo "I2P started [$PID]" >&2
38- echo $PID > "${I2PTEMP}/router.pid"
39-else
40- echo "I2P failed to start." >&2
41- exit 1
42-fi
43+exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch