* Bugfix: Running the installer as a non-privileged user on Red Hat (and
hopefully any other affected *nix systems) now properly discards non- essential directories after installation. * Support for Win9x in the installer and postinstall.bat. * Changed the name of the default installation directory on all platforms from "I2P" to "i2p" in the installer. * Changed "wrapper.conf" to "wrapper.config" for naming consistency with the other configuration files.
This commit is contained in:
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
|
||||
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
|
@ -3,8 +3,8 @@
|
||||
<processing>
|
||||
<job name="Launching I2P...">
|
||||
<os family="windows" />
|
||||
<executefile name="cmd.exe">
|
||||
<arg>/c</arg><arg>"$INSTALL_PATH\postinstall.bat"</arg>
|
||||
<executefile name="$INSTALL_PATH\postinstall.bat">
|
||||
<arg>$INSTALL_PATH</arg>
|
||||
</executefile>
|
||||
</job>
|
||||
<job name="Launching I2P...">
|
||||
|
@ -18,7 +18,7 @@ APP_LONG_NAME="I2P Service"
|
||||
|
||||
# Wrapper
|
||||
WRAPPER_CMD="./i2psvc"
|
||||
WRAPPER_CONF="wrapper.conf"
|
||||
WRAPPER_CONF="wrapper.config"
|
||||
|
||||
# Priority at which to run the wrapper. See "man nice" for valid priorities.
|
||||
# nice is only used if a priority is specified.
|
||||
|
@ -28,7 +28,7 @@ rem
|
||||
:conf
|
||||
set _WRAPPER_CONF="%~f1"
|
||||
if not %_WRAPPER_CONF%=="" goto startup
|
||||
set _WRAPPER_CONF="%_REALPATH%wrapper.conf"
|
||||
set _WRAPPER_CONF="%_REALPATH%wrapper.config"
|
||||
|
||||
rem
|
||||
rem Start the Wrapper
|
||||
|
@ -8,7 +8,7 @@ tunnel.0.proxyList=squid.i2p,www1.squid.i2p
|
||||
tunnel.0.i2cpHost=localhost
|
||||
tunnel.0.i2cpPort=7654
|
||||
tunnel.0.option.tunnels.depthInbound=2
|
||||
tunnel.0.option.tunnels.numInbound=2
|
||||
tunnel.0.option.tunnels.numTunnels=2
|
||||
tunnel.0.startOnLoad=true
|
||||
|
||||
# irc
|
||||
@ -21,7 +21,7 @@ tunnel.1.targetDestination=irc.duck.i2p
|
||||
tunnel.1.i2cpHost=localhost
|
||||
tunnel.1.i2cpPort=7654
|
||||
tunnel.1.option.tunnels.depthInbound=2
|
||||
tunnel.1.option.tunnels.numInbound=2
|
||||
tunnel.1.option.tunnels.numTunnels=2
|
||||
tunnel.1.startOnLoad=true
|
||||
|
||||
# I2P's cvs server
|
||||
@ -34,7 +34,7 @@ tunnel.2.targetDestination=cvs.i2p
|
||||
tunnel.2.i2cpHost=localhost
|
||||
tunnel.2.i2cpPort=7654
|
||||
tunnel.2.option.tunnels.depthInbound=2
|
||||
tunnel.2.option.tunnels.numInbound=2
|
||||
tunnel.2.option.tunnels.numTunnels=2
|
||||
tunnel.2.startOnLoad=false
|
||||
|
||||
# local eepserver
|
||||
@ -47,5 +47,5 @@ tunnel.2.startOnLoad=false
|
||||
#tunnel.3.i2cpHost=localhost
|
||||
#tunnel.3.i2cpPort=7654
|
||||
#tunnel.3.option.tunnels.depthInbound=2
|
||||
#tunnel.3.option.tunnels.numInbound=2
|
||||
#tunnel.3.option.tunnels.numTunnels=2
|
||||
#tunnel.3.startOnLoad=true
|
@ -12,10 +12,19 @@
|
||||
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
if "%OS%"=="Windows_NT" (
|
||||
set INSTALL_PATH=%~dp0
|
||||
) else (
|
||||
set INSTALL_PATH="%1"
|
||||
)
|
||||
|
||||
copy "%INSTALL_PATH%lib\wrapper\win32\I2Psvc.exe" "%INSTALL_PATH%"
|
||||
copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.dll" "%INSTALL_PATH%lib"
|
||||
copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.jar" "%INSTALL_PATH%lib"
|
||||
|
||||
if "%OS%"=="Windows_NT" (
|
||||
|
||||
del /f /q "%INSTALL_PATH%i2prouter"
|
||||
:: del /f /q "%INSTALL_PATH%install_i2p_service_unix"
|
||||
del /f /q "%INSTALL_PATH%install-headless.txt"
|
||||
@ -25,3 +34,19 @@ del /f /q "%INSTALL_PATH%postinstall.sh"
|
||||
del /f /q "%INSTALL_PATH%icons\*.xpm"
|
||||
rmdir /q /s "%INSTALL_PATH%lib\wrapper"
|
||||
start /b /i /d"%INSTALL_PATH%" i2prouter.bat
|
||||
|
||||
) else (
|
||||
|
||||
del "%INSTALL_PATH%i2prouter"
|
||||
:: del "%INSTALL_PATH%install_i2p_service_unix"
|
||||
del "%INSTALL_PATH%install_i2p_service_winnt.bat"
|
||||
del "%INSTALL_PATH%install-headless.txt"
|
||||
del "%INSTALL_PATH%osid"
|
||||
del "%INSTALL_PATH%postinstall.sh"
|
||||
:: del "%INSTALL_PATH%uninstall_i2p_service_unix"
|
||||
del "%INSTALL_PATH%uninstall_i2p_service_winnt.bat"
|
||||
del "%INSTALL_PATH%icons\*.xpm"
|
||||
deltree /Y "%INSTALL_PATH%lib\wrapper"
|
||||
start /M "%INSTALL_PATH%i2prouter.bat"
|
||||
|
||||
)
|
||||
|
@ -56,8 +56,8 @@ esac
|
||||
cp $wrapperpath/wrapper.jar ./lib/
|
||||
cp $wrapperpath/i2psvc .
|
||||
chmod 744 ./i2psvc
|
||||
rm -rdf ./icons
|
||||
rm -rdf ./lib/wrapper
|
||||
rm -rf ./icons
|
||||
rm -rf ./lib/wrapper
|
||||
rm -f ./lib/*.dll
|
||||
rm -f ./*.bat
|
||||
./i2prouter start
|
||||
|
Reference in New Issue
Block a user