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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-12-07 14:35:37 +0100 (Fri, 07 Dec 2007)
New Revision: 629

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

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


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-07 13:28:24 UTC (rev 628)
+++ trunk/ChangeLog	2007-12-07 13:35:37 UTC (rev 629)
@@ -1,7 +1,7 @@
 2007-12-07  Marcus Brinkmann  <marcus at g10code.de>
 
-	* src/uninst-gpgex.nsi: Detect and uninstall a previously
-	installed GPGee.
+	* src/inst-gpgex.nsi: Detect and uninstall a previously installed
+	GPGee.
 
 2007-12-03  Marcus Brinkmann  <marcus at g10code.de>
 

Modified: trunk/src/inst-gpgex.nsi
===================================================================
--- trunk/src/inst-gpgex.nsi	2007-12-07 13:28:24 UTC (rev 628)
+++ trunk/src/inst-gpgex.nsi	2007-12-07 13:35:37 UTC (rev 629)
@@ -29,6 +29,18 @@
   File "${gpg4win_pkg_gpgex}"
 !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:
+
   ClearErrors
   SetOverwrite try
   File ${prefix}/bin/gpgex.dll

Modified: trunk/src/uninst-gpgex.nsi
===================================================================
--- trunk/src/uninst-gpgex.nsi	2007-12-07 13:28:24 UTC (rev 628)
+++ trunk/src/uninst-gpgex.nsi	2007-12-07 13:35:37 UTC (rev 629)
@@ -30,18 +30,6 @@
   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"