[Greater-commits] r3608 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-18 11:32:27 +0200 (Mon, 18 Jul 2011)
New Revision: 3608

Modified:
   trunk/packaging/greater-installer.nsi
Log:
Cleanup installdir after uninstallation


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-18 09:32:05 UTC (rev 3607)
+++ trunk/packaging/greater-installer.nsi	2011-07-18 09:32:27 UTC (rev 3608)
@@ -379,12 +379,26 @@
   ; Delete Registry keys
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${productname_short}"
   DeleteRegKey HKLM "Software\${productname_short}"
+
+  ; Delete Shortcuts
+  SetShellVarContext all
+  RMDir /R  "$SMPROGRAMS\${productname}"
+  Delete "$DESKTOP\${productname_short}.lnk"
+  Delete "$QUICKLAUNCH\${productname_short}.lnk"
+  SetShellVarContext current
+  RMDir /R  "$SMPROGRAMS\${productname}"
+  Delete "$DESKTOP\${productname_short}.lnk"
+  Delete "$QUICKLAUNCH\${productname_short}.lnk"
+
+  ; Cleanup
+  RMDir /R "$INSTDIR\GREAT-ER"
+  RMDir "$INSTDIR\GREAT-ER-DB"
+  RMDir "$INSTDIR\Administration"
+  Delete "$INSTDIR\Uninstall.exe"
+  RMDir "$INSTDIR"
 SectionEnd
 
 Section "un.PostgreSQL" UnSecPostgreSQL
-  MessageBox MB_YESNO|MB_ICONQUESTION "Do you really wish to uninstall PostgreSQL?\
-  This will also remove all data from your GREAT-ER Database!" \
-  IDYES uninstallPostgreSQL IDNO no
   uninstallPostgreSQL:
    Banner::show /NOUNLOAD /set 76 "Uninstalling PostgreSQL..."
    ; TODO find path from registry and uninstall
@@ -392,7 +406,12 @@
    Banner::destroy 
    RMDIR "$INSTDIR\postgres9"
    RMDIR "$INSTDIR"
-  no:
+   MessageBox MB_YESNO|MB_ICONQUESTION "Do you also want to delete contents of your \
+   GREAT-ER Database?" \
+   IDYES deletedb IDNO no
+   deletedb:
+   RMDIR /r "$INSTDIR\GREAT-ER-DB\database"
+   no:
 SectionEnd
 
 Section "un.Python"
@@ -431,7 +450,6 @@
   StrCmp $1 "Admin" leave +1
   MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_AdminNeeded_uninstall)"
   Quit
-
  leave:
 FunctionEnd