zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix hang during uninstallation (#656)

Browse Source
This commit is contained in:
kytv
2012-08-18 13:06:07 +00:00
parent 3a546612d9
commit 264df83943
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
history.txt
View File

@@ -1,3 +1,6 @@
2012-08-18 kytv
* Fix hang during uninstallation experienced by some users in Windows
2012-08-17 zzz 2012-08-17 zzz
* i2psnark: * i2psnark:
- Adjust DHT timeouts - Adjust DHT timeouts

25
installer/install.xml
View File

@@ -195,7 +195,7 @@
<args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable> <args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
--> -->
<!-- workaround for bad default path for wrapper.log in Windows. --> <!-- workaround for bad default path for wrapper.log in Windows. -->
<executable targetfile="$INSTALL_PATH/fixpaths.cmd" type="bin" stage="postinstall" keep="false"> <os family="windows" /> <executable targetfile="$INSTALL_PATH/fixpaths.cmd" type="bin" stage="postinstall" keep="false"> <os family="windows" />
</executable> </executable>
<!-- workaround for vista permission problems - see comments above --> <!-- workaround for vista permission problems - see comments above -->
@@ -213,26 +213,21 @@
<executable targetfile="$INSTALL_PATH/installer/exec.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" /> <executable targetfile="$INSTALL_PATH/installer/exec.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH" /><arg value="$INSTALL_PATH\I2Psvc.exe" /><arg value="-c" /><arg value="$INSTALL_PATH\wrapper.config" /></args></executable> <args><arg value="$INSTALL_PATH" /><arg value="$INSTALL_PATH\I2Psvc.exe" /><arg value="-c" /><arg value="$INSTALL_PATH\wrapper.config" /></args></executable>
--> -->
<!-- postinstall stuff for *nix --> <!-- postinstall stuff for *nix -->
<!-- stage=never means chmod a+x --> <!-- stage=never means chmod a+x -->
<executable targetfile="$INSTALL_PATH/postinstall.sh" type="bin" stage="never" keep="true" failure="warn"><os family="unix" /></executable> <executable targetfile="$INSTALL_PATH/postinstall.sh" type="bin" stage="never" keep="true" failure="warn"><os family="unix" /></executable>
<executable targetfile="$INSTALL_PATH/postinstall.sh" type="bin" stage="postinstall" keep="true" failure="warn"><os family="unix" /> <executable targetfile="$INSTALL_PATH/postinstall.sh" type="bin" stage="postinstall" keep="true" failure="warn"><os family="unix" />
<args><arg value="$INSTALL_PATH" /></args></executable> <args><arg value="$INSTALL_PATH" /></args></executable>
<!-- <!--
Removal of the I2P service in Windows should be done in the base pack Removal of the I2P service in Windows should be done in the base pack
so that even if a user installed the service manually it will still be so that even if a user installed the service manually it will still be
removed when uninstalling. removed when uninstalling.
--> -->
<executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" os="windows"> <executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" os="windows" />
<args>
<arg value="$INSTALL_PATH\wrapper.config" />
<arg value="--nopause" />
</args>
</executable>
<executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="false" failure="warn"> <os family="windows" /> <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="false" failure="warn"> <os family="windows" />
<args><arg value="$INSTALL_PATH/installer/" /></args></executable> <args><arg value="$INSTALL_PATH/installer/" /></args></executable>
</pack> </pack>
@@ -241,7 +236,7 @@
<description>Automatically start I2P in the background</description> <description>Automatically start I2P in the background</description>
<os family="windows" /> <os family="windows" />
<executable targetfile="$INSTALL_PATH/set_config_dir_for_nt_service.bat" stage="postinstall" failure="warn" keep="true" /> <executable targetfile="$INSTALL_PATH/set_config_dir_for_nt_service.bat" stage="postinstall" failure="warn" keep="true" />
<executable targetfile="$INSTALL_PATH/install_i2p_service_winnt.bat" stage="postinstall" failure="warn" keep="true" /> <executable targetfile="$INSTALL_PATH/install_i2p_service_winnt.bat" stage="postinstall" failure="warn" keep="true" />
<executable targetfile="$INSTALL_PATH/I2Psvc.exe" stage="postinstall" failure="warn" keep="true"> <executable targetfile="$INSTALL_PATH/I2Psvc.exe" stage="postinstall" failure="warn" keep="true">
<args> <args>
<arg value="-t" /> <arg value="-t" />

9
installer/resources/uninstall_i2p_service_winnt.bat
View File

@@ -15,7 +15,7 @@ rem
rem ----------------------------------------------------------------------------- rem -----------------------------------------------------------------------------
rem These settings can be modified to fit the needs of your application rem These settings can be modified to fit the needs of your application
rem Optimized for use with version 3.5.9 of the Wrapper. rem Optimized for use with version 3.5.14 of the Wrapper.
rem The base name for the Wrapper binary. rem The base name for the Wrapper binary.
set _WRAPPER_BASE=i2psvc set _WRAPPER_BASE=i2psvc
@@ -87,10 +87,7 @@ set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
:: isn't installed there isn't anything for us to do :: isn't installed there isn't anything for us to do
:: other than exit. :: other than exit.
"%_WRAPPER_EXE%" -qs %_WRAPPER_CONF% "%_WRAPPER_EXE%" -qs %_WRAPPER_CONF%
if %errorlevel%==0 ( if %errorlevel%==0 goto eof
echo The I2P Service service was not installed.
goto eof
)
call "%_REALPATH%"\set_config_dir_for_nt_service.bat uninstall call "%_REALPATH%"\set_config_dir_for_nt_service.bat uninstall
rem rem
@@ -99,7 +96,5 @@ rem
:startup :startup
"%_WRAPPER_EXE%" -r %_WRAPPER_CONF% "%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
if not errorlevel 1 goto :eof if not errorlevel 1 goto :eof
if "%2"=="--nopause" goto :eof
pause
:eof :eof