SecBSD's official ports repository

net/i2p/patches/patch-installer_resources_i2prouter

@@ -0,0 +1,54 @@
+set correct base
+set proper path for log and temp dirs
+remove link to internal wrapper - doesn't work
+set link to tanukiwrapper
+
+--- installer/resources/i2prouter.orig	Mon May 25 18:07:52 2020
++++ installer/resources/i2prouter	Sat Aug  1 01:12:28 2020
+@@ -28,7 +28,7 @@
+ # 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"
++I2P="${LOCALBASE}/share/i2p"
+ if [ "`uname -s`" = "Darwin" ]; then
+    if [ -d "%USER_HOME/Library/Application Support" ]; then
+        I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
+@@ -36,9 +36,9 @@ if [ "`uname -s`" = "Darwin" ]; then
+        I2P_CONFIG_DIR="%USER_HOME/.i2p"
+    fi
+ else
+-    I2P_CONFIG_DIR="%USER_HOME/.i2p"
++    I2P_CONFIG_DIR="${DB_DIR}"
+ fi
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2PTEMP="${DB_DIR}"
+ # PORTABLE installation:
+ # Use the following instead.
+ #I2PTEMP="%INSTALL_PATH"
+@@ -69,7 +69,7 @@ fi
+ #RUN_AS_USER=
+ 
+ # Wrapper
+-WRAPPER_CMD="$I2P/i2psvc"
++WRAPPER_CMD="${LOCALBASE}/sbin/tanukiwrapper"
+ WRAPPER_CONF="$I2P/wrapper.config"
+ 
+ # Priority at which to run the wrapper.  See "man nice" for valid priorities.
+@@ -548,14 +548,14 @@ outputFile() {
+ }
+ 
+ setup_openbsd() {
+-    if ! pkg_info -qe 'java-tanukiwrapper->=3.5.19'; then
++    if ! pkg_info -qe 'tanukiwrapper->=3.5.19'; then
+         echo "Java wrapper not found. Either:"
+         echo "- install the package java-tanukiwrapper then start I2P again; or"
+         echo "- start I2P with $I2P/runplain.sh"
+         exit 1
+     else
+         # Wrapper package is installed so let's try copying the bits into the proper places
+-        pkg_path=$(pkg_info -v java-tanukiwrapper   | awk '/^@cwd/{print $2}')
++        pkg_path=$(pkg_info -v tanukiwrapper   | awk '/^@cwd/{print $2}')
+         if [ -z $pkg_path ]; then
+             # Fallback, but we shouldn't end up here
+             echo "Unable to locate ${WRAPPER_CMD} in ${I2P}!"