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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-11-10 16:35:15 +0100 (Mon, 10 Nov 2008)
New Revision: 1023

Modified:
   trunk/ChangeLog
   trunk/src/installer-finish.nsi
Log:
2008-11-10  Marcus Brinkmann  <marcus at g10code.com>

	* src/installer-finish.nsi (no_quick_launch_uninstall): Clean up
	GNU directory, if empty.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-10 15:12:23 UTC (rev 1022)
+++ trunk/ChangeLog	2008-11-10 15:35:15 UTC (rev 1023)
@@ -1,9 +1,10 @@
 2008-11-10  Marcus Brinkmann  <marcus at g10code.com>
 
+	* src/installer-finish.nsi (no_quick_launch_uninstall): Clean up
+	GNU directory, if empty.
+
 	* src/inst-gpa.nsi (DESC_Menu_Gpa): Remove winpt reference.
 
-2008-11-10  Marcus Brinkmann  <marcus at g10code.com>
-
 	* src/installer.nsi: Give German translation for language setup.
 	Clarify string.
 

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2008-11-10 15:12:23 UTC (rev 1022)
+++ trunk/src/installer-finish.nsi	2008-11-10 15:35:15 UTC (rev 1023)
@@ -150,6 +150,11 @@
   Delete "$INSTDIR\${PACKAGE}-uninstall.exe"
   RMDir "$INSTDIR"
 
+  # If we installed in the default location, try to be really, really
+  # nice with sugar on it to clean up behind us.
+  StrCmp "$INSTDIR" "$PROGRAMFILES\GNU\${INSTALL_DIR}" 0 +2
+  RMDir "$PROGRAMFILES\GNU"
+
   # Clean the registry.
   DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
         "Install Directory"