fix hang during uninstallation (#656)

history.txt

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

installer/install.xml

@@ -195,7 +195,7 @@
 	        <args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
 		-->
             <!-- 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>
 
             <!-- 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" />
                 <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 -->
             <!-- 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="postinstall" keep="true" failure="warn"><os family="unix" />
                 <args><arg value="$INSTALL_PATH" /></args></executable>
-	    <!-- 
-	     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
-	     removed when uninstalling.
-	    -->
-            <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>
+            <!--
+             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
+             removed when uninstalling.
+            -->
+            <executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" os="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>
 
@@ -241,7 +236,7 @@
             <description>Automatically start I2P in the background</description>
             <os family="windows" />
             <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">
                 <args>
                     <arg value="-t" />

installer/resources/uninstall_i2p_service_winnt.bat

@@ -15,7 +15,7 @@ rem
 
 rem -----------------------------------------------------------------------------
 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.
 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
 :: other than exit.
 "%_WRAPPER_EXE%" -qs %_WRAPPER_CONF%
-if %errorlevel%==0 (
-     echo The I2P Service service was not installed.
-     goto eof
-)
+if %errorlevel%==0 goto eof
 
 call "%_REALPATH%"\set_config_dir_for_nt_service.bat uninstall
 rem
@@ -99,7 +96,5 @@ rem
 :startup
 "%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
 if not errorlevel 1 goto :eof
-if "%2"=="--nopause" goto :eof
-pause
 
 :eof