From 04621ff64ab8a9efa99854d2eb03867200da973d Mon Sep 17 00:00:00 2001
From: hypercubus <hypercubus>
Date: Thu, 19 Aug 2004 05:41:36 +0000
Subject: [PATCH] * service wrapper fully functioning under Linux and WinXP,
should also be working for the other *nix platforms but this isn't tested yet
* renaming wrapper binaries to 'i2psvc' for *nix and 'I2Psvc.exe' for win32
---
installer/lib/wrapper/aix/{wrapper => i2psvc} | Bin
installer/lib/wrapper/freebsd/{wrapper => i2psvc} | Bin
installer/lib/wrapper/hpux/{wrapper => i2psvc} | Bin
installer/lib/wrapper/hpux64/{wrapper => i2psvc} | Bin
installer/lib/wrapper/i2prouter | 14 +++++++-------
installer/lib/wrapper/i2prouter.bat | 2 +-
.../lib/wrapper/install_i2p_service_winnt.bat | 2 +-
installer/lib/wrapper/irix/{wrapper => i2psvc} | Bin
installer/lib/wrapper/linux/{wrapper => i2psvc} | Bin
installer/lib/wrapper/macosx/{wrapper => i2psvc} | Bin
installer/lib/wrapper/osf1/{wrapper => i2psvc} | Bin
installer/lib/wrapper/solaris/{wrapper => i2psvc} | Bin
.../lib/wrapper/uninstall_i2p_service_winnt.bat | 2 +-
installer/lib/wrapper/wrapper.conf | 4 ++--
14 files changed, 12 insertions(+), 12 deletions(-)
rename installer/lib/wrapper/aix/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/freebsd/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/hpux/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/hpux64/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/irix/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/linux/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/macosx/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/osf1/{wrapper => i2psvc} (100%)
rename installer/lib/wrapper/solaris/{wrapper => i2psvc} (100%)
diff --git a/installer/lib/wrapper/aix/wrapper b/installer/lib/wrapper/aix/i2psvc
similarity index 100%
rename from installer/lib/wrapper/aix/wrapper
rename to installer/lib/wrapper/aix/i2psvc
diff --git a/installer/lib/wrapper/freebsd/wrapper b/installer/lib/wrapper/freebsd/i2psvc
similarity index 100%
rename from installer/lib/wrapper/freebsd/wrapper
rename to installer/lib/wrapper/freebsd/i2psvc
diff --git a/installer/lib/wrapper/hpux/wrapper b/installer/lib/wrapper/hpux/i2psvc
similarity index 100%
rename from installer/lib/wrapper/hpux/wrapper
rename to installer/lib/wrapper/hpux/i2psvc
diff --git a/installer/lib/wrapper/hpux64/wrapper b/installer/lib/wrapper/hpux64/i2psvc
similarity index 100%
rename from installer/lib/wrapper/hpux64/wrapper
rename to installer/lib/wrapper/hpux64/i2psvc
diff --git a/installer/lib/wrapper/i2prouter b/installer/lib/wrapper/i2prouter
index 95a27c17a9..ebf5f01b71 100644
--- a/installer/lib/wrapper/i2prouter
+++ b/installer/lib/wrapper/i2prouter
@@ -17,7 +17,7 @@ APP_NAME="i2p"
APP_LONG_NAME="I2P Service"
# Wrapper
-WRAPPER_CMD="wrapper"
+WRAPPER_CMD="i2psvc"
WRAPPER_CONF="wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
@@ -157,9 +157,9 @@ console() {
then
if [ "X$IGNORE_SIGNALS" = "X" ]
then
- exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE
+ exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE
else
- exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE
+ exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE
fi
else
echo "$APP_LONG_NAME is already running."
@@ -176,16 +176,16 @@ start() {
then
if [ "X$RUN_AS_USER" = "X" ]
then
- exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE
+ exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.daemonize=TRUE
else
- su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE"
+ su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.daemonize=TRUE"
fi
else
if [ "X$RUN_AS_USER" = "X" ]
then
- exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE
+ exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE
else
- su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE"
+ su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE"
fi
fi
else
diff --git a/installer/lib/wrapper/i2prouter.bat b/installer/lib/wrapper/i2prouter.bat
index 942eae3208..7f6977e097 100644
--- a/installer/lib/wrapper/i2prouter.bat
+++ b/installer/lib/wrapper/i2prouter.bat
@@ -20,7 +20,7 @@ rem Find the application home.
rem
rem %~dp0 is location of current script under NT
set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
rem
rem Find the wrapper.conf
diff --git a/installer/lib/wrapper/install_i2p_service_winnt.bat b/installer/lib/wrapper/install_i2p_service_winnt.bat
index e1dc453346..9ce2d0a1f1 100644
--- a/installer/lib/wrapper/install_i2p_service_winnt.bat
+++ b/installer/lib/wrapper/install_i2p_service_winnt.bat
@@ -15,7 +15,7 @@ rem Find the application home.
rem
rem %~dp0 is location of current script under NT
set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
rem
rem Find the wrapper.conf
diff --git a/installer/lib/wrapper/irix/wrapper b/installer/lib/wrapper/irix/i2psvc
similarity index 100%
rename from installer/lib/wrapper/irix/wrapper
rename to installer/lib/wrapper/irix/i2psvc
diff --git a/installer/lib/wrapper/linux/wrapper b/installer/lib/wrapper/linux/i2psvc
similarity index 100%
rename from installer/lib/wrapper/linux/wrapper
rename to installer/lib/wrapper/linux/i2psvc
diff --git a/installer/lib/wrapper/macosx/wrapper b/installer/lib/wrapper/macosx/i2psvc
similarity index 100%
rename from installer/lib/wrapper/macosx/wrapper
rename to installer/lib/wrapper/macosx/i2psvc
diff --git a/installer/lib/wrapper/osf1/wrapper b/installer/lib/wrapper/osf1/i2psvc
similarity index 100%
rename from installer/lib/wrapper/osf1/wrapper
rename to installer/lib/wrapper/osf1/i2psvc
diff --git a/installer/lib/wrapper/solaris/wrapper b/installer/lib/wrapper/solaris/i2psvc
similarity index 100%
rename from installer/lib/wrapper/solaris/wrapper
rename to installer/lib/wrapper/solaris/i2psvc
diff --git a/installer/lib/wrapper/uninstall_i2p_service_winnt.bat b/installer/lib/wrapper/uninstall_i2p_service_winnt.bat
index ef837cb4ad..f1353ab542 100644
--- a/installer/lib/wrapper/uninstall_i2p_service_winnt.bat
+++ b/installer/lib/wrapper/uninstall_i2p_service_winnt.bat
@@ -15,7 +15,7 @@ rem Find the application home.
rem
rem %~dp0 is location of current script under NT
set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
rem
rem Find the wrapper.conf
diff --git a/installer/lib/wrapper/wrapper.conf b/installer/lib/wrapper/wrapper.conf
index f28e76b5f0..d17a49a90a 100644
--- a/installer/lib/wrapper/wrapper.conf
+++ b/installer/lib/wrapper/wrapper.conf
@@ -47,7 +47,7 @@ wrapper.java.library.path.2=lib
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=net.i2p.router.Router
wrapper.app.parameter.2=--quiet
-wrapper.app.parameter.3=> /dev/null &
+wrapper.app.parameter.3=> /dev/null
#********************************************************************
# Wrapper Logging Properties
@@ -59,7 +59,7 @@ wrapper.console.format=PM
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
-wrapper.logfile=../logs/wrapper.log
+wrapper.logfile=logs/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
--
GitLab