From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 16 Sep 2015 12:21:04 +0000 (+0200)
Subject: Fix windows uninstall does not remove start menu shortcuts YAZ-860
X-Git-Tag: v5.14.11~8
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=2a624ff1daa841601aebca86c0196039da6978b3;p=yaz-moved-to-github.git

Fix windows uninstall does not remove start menu shortcuts YAZ-860
---

diff --git a/win/yaz.nsi b/win/yaz.nsi
index a01dcdd..eaf68d8 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -33,6 +33,8 @@ InstallDir "$PROGRAMFILES\YAZ"
 !endif
 
 
+RequestExecutionLevel admin
+
 SetCompressor bzip2
 
 Name "YAZ"
@@ -196,12 +198,11 @@ SectionEnd
 UninstallText "This will uninstall YAZ ${VERSION} from your system"
 
 Section Uninstall
-; add delete commands to delete whatever files/registry keys/etc you installed here.
+	ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
+	RMDir /r $SMPROGRAMS\YAZ
 	Delete "$INSTDIR\uninst.exe"
 	DeleteRegKey HKLM "SOFTWARE\Index Data\YAZ"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\YAZ"
-	ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
-	RMDir /r $SMPROGRAMS\YAZ
 	RMDir /r $INSTDIR
 	${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin"
         IfFileExists $INSTDIR 0 Removed