2009-02-25 Marcus Brinkmann <marcus@g10code.de>

	* src/installer-finish.nsi (Section "Uninstall"): Add RMDir
	instructions with REBOOTOK for some directories.

diff --git a/ChangeLog b/ChangeLog
index 2d7a2ea..ce34e55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/installer-finish.nsi (Section "Uninstall"): Add RMDir
+       instructions with REBOOTOK for some directories.
+
 2009-02-20  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
 
        * po/de.po: Add description for GpgOL and GpgEX: Kleo or GPA needed.

diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index da42c2a..1a9c5b8 100644 (file)
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -169,9 +169,12 @@ no_quick_launch_uninstall:
   RMDir "$INSTDIR"
 
   # If we installed in the default location, try to be really, really
-  # nice with sugar on it to clean up behind us.
+  # nice with sugar on it to clean up behind us.  In any case, try very
+  # hard to get rid of directories which could have REBOOTOK files.
+  RMDir /REBOOTOK "$INSTDIR\bin"
+  RMDir /REBOOTOK "$INSTDIR"
   StrCmp "$INSTDIR" "$PROGRAMFILES\GNU\${INSTALL_DIR}" 0 +2
-  RMDir "$PROGRAMFILES\GNU"
+  RMDir /REBOOTOK "$PROGRAMFILES\GNU"
 
   # Clean the registry.
   DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \