[Gpg4win-commits] r1109 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-02-25 14:10:07 +0100 (Wed, 25 Feb 2009)
New Revision: 1109

Modified:
   trunk/ChangeLog
   trunk/src/installer-finish.nsi
Log:
2009-02-25  Marcus Brinkmann  <marcus at g10code.de>

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


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-20 12:56:57 UTC (rev 1108)
+++ trunk/ChangeLog	2009-02-25 13:10:07 UTC (rev 1109)
@@ -1,3 +1,8 @@
+2009-02-25  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/installer-finish.nsi (Section "Uninstall"): Add RMDir
+	instructions with REBOOTOK for some directories.
+
 2009-02-20  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* po/de.po: Add description for GpgOL and GpgEX: Kleo or GPA needed.

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2009-02-20 12:56:57 UTC (rev 1108)
+++ trunk/src/installer-finish.nsi	2009-02-25 13:10:07 UTC (rev 1109)
@@ -169,9 +169,12 @@
   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}" \