Changeset 161e4b2fd1aeffd57329e6081c9670fc792c7c6f

Timestamp:

06/15/11 00:04:57 (2 years ago)

Author:

kytv@…

Branches:

i2p.i2p

Children:

f1c24b37e96eaa7d34df298c0c279d3fb9d46eb9

Parents:

93a57a1543713d65f142e9570751bda1129f3d51

Message:

Windows Uninstall the service if I2P is installed, whether the service was enabled by the installer or not.

Files:

• installer/install.xml (modified) (2 diffs)

/installer/install.xml

@@ -197 +197 @@
             <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>
+
 
         </pack>
@@ -218 +230 @@
                 </args>
             </executable>
-            <executable targetfile="$INSTALL_PATH/uninstall_i2p_service_winnt.bat" stage="uninstall" failure="warn" keep="true">
-                <args>
-                    <arg value="$INSTALL_PATH\wrapper.config" />
-                    <arg value="--nopause" />
-                </args>
-            </executable>
         </pack>
     </packs>