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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-12-07 14:27:41 +0100 (Fri, 07 Dec 2007)
New Revision: 627

Modified:
   trunk/ChangeLog
   trunk/src/uninst-gpgex.nsi
Log:
2007-12-07  Marcus Brinkmann  <marcus at g10code.de>

	* src/uninst-gpgex.nsi: Detect and uninstall a previously
	installed GPGee.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-07 13:25:26 UTC (rev 626)
+++ trunk/ChangeLog	2007-12-07 13:27:41 UTC (rev 627)
@@ -1,3 +1,8 @@
+2007-12-07  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/uninst-gpgex.nsi: Detect and uninstall a previously
+	installed GPGee.
+
 2007-12-03  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/make-msi.pl (dump_all2): Hard code level for hidden packages

Modified: trunk/src/uninst-gpgex.nsi
===================================================================
--- trunk/src/uninst-gpgex.nsi	2007-12-07 13:25:26 UTC (rev 626)
+++ trunk/src/uninst-gpgex.nsi	2007-12-07 13:27:41 UTC (rev 627)
@@ -30,6 +30,18 @@
   Call un.SourceDelete
 !else
 
+# Uninstall a previous gpgee version, if it exists.
+  ifFileExists "$INSTDIR\GPGee.dll" 0 gpgex_no_gpgee
+    UnRegDLL "$INSTDIR\GPGee.dll"
+    Delete /REBOOTOK "$INSTDIR\GPGee.dll"
+    Delete /REBOOTOK "$INSTDIR\GPGee.DEU"
+    Delete "$INSTDIR\GPGee.hlp"
+    Delete "$INSTDIR\share\gpgee\gpl.txt"
+    RMDir "$INSTDIR\share\gpgee"
+    RMDir "$INSTDIR\share"
+    RMDir "$INSTDIR"
+  gpgex_no_gpgee:
+
   Delete "$INSTDIR\share\doc\gpgex\gpgex-en.html"
   Delete "$INSTDIR\share\doc\gpgex\gpgex-de.html"
   RMDir "$INSTDIR\share\doc\gpgex"