# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1413371945 -7200
# Node ID c7349696d812497ab64fddc9e85017a257d72fb3
# Parent  64333dad503be83b78387e64ba5b26688b6d9944
(issue44) Be more agressive deleting old installers

diff -r 64333dad503b -r c7349696d812 packaging/trustbridge.nsi
--- a/packaging/trustbridge.nsi	Wed Oct 15 13:18:30 2014 +0200
+++ b/packaging/trustbridge.nsi	Wed Oct 15 13:19:05 2014 +0200
@@ -282,16 +282,13 @@
 !include "StrFunc.nsh"
 
 Section "Uninstall"
+  ExpandEnvStrings $0 %LOCALAPPDATA%
+  Delete "$0\BSI\TrustBridge\SW*.exe"
   StrCmp "$douninstcertificates" "TRUE" 0 skip_certs
-  ExpandEnvStrings $0 %LOCALAPPDATA%
   nsExec::ExecToLog '"$INSTDIR\trustbridge-certificate-installer.exe" "list=$0\BSI\TrustBridge\list-installed.txt" "choices=uninstall"'
   Delete "$0\BSI\TrustBridge\list*.txt"
-  Delete "$0\BSI\TrustBridge\SW*.exe"
-  RmDir "$0\BSI\TrustBridge"
-  RmDir "$0\BSI"
   ExpandEnvStrings $0 %APPDATA%
   Delete "$0\BSI\TrustBridge.ini"
-  RmDir "$0\BSI"
   var /GLOBAL user_count
   StrCpy $user_count 0
 
@@ -331,6 +328,9 @@
     Delete "$INSTDIR\trustbridge-nss-installer.exe"
 dontDeleteNSS:
   !include "filelist_un.nsh"
+  ExpandEnvStrings $0 %LOCALAPPDATA%
+  RmDir "$0\BSI\TrustBridge"
+  RmDir "$0\BSI"
   Delete "$INSTDIR\Uninstall.exe"
   RMDir "$INSTDIR"