From da59b51c5ebbe8c0aa678a36a71511e9a7cd9815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=20Morschh=C3=A4user?= <mark@tvk.rwth-aachen.de>
Date: Wed, 12 Mar 2014 10:04:31 +0100
Subject: [PATCH] Fixed deletion of startmenu folder on uninstall + code indent

---
 nsis/cockatrice.nsi | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi
index f3fec373..c7398b74 100644
--- a/nsis/cockatrice.nsi
+++ b/nsis/cockatrice.nsi
@@ -34,6 +34,7 @@ InstallDir "$PROGRAMFILES\Cockatrice"
 !insertmacro MUI_LANGUAGE "English"
 
 Section "Application" SecApplication
+	SetShellVarContext all
 	SetOutPath "$INSTDIR"
 	File ..\build\cockatrice\Release\cockatrice.exe
 	File ..\build\oracle\Release\oracle.exe
@@ -67,9 +68,9 @@ Section "Application" SecApplication
 	SetOutPath "$INSTDIR\translations"
 	File /r ..\build\cockatrice\*.qm
 
-        WriteUninstaller "$INSTDIR\uninstall.exe"
-        ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-        IntFmt $0 "0x%08X" $0
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+	${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+	IntFmt $0 "0x%08X" $0
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayName" "Cockatrice"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
@@ -93,35 +94,36 @@ Section "Start menu item" SecStartMenu
 SectionEnd
 
 Section Uninstall
-        RMDir /r "$INSTDIR\zonebg"
-        RMDir /r "$INSTDIR\plugins"
-        RMDir /r "$INSTDIR\sounds"
+SetShellVarContext all
+	RMDir /r "$INSTDIR\zonebg"
+	RMDir /r "$INSTDIR\plugins"
+	RMDir /r "$INSTDIR\sounds"
 	RMDir /r "$INSTDIR\translations"
-        Delete "$INSTDIR\uninstall.exe"
-        Delete "$INSTDIR\cockatrice.exe"
-        Delete "$INSTDIR\oracle.exe"
+	Delete "$INSTDIR\uninstall.exe"
+	Delete "$INSTDIR\cockatrice.exe"
+	Delete "$INSTDIR\oracle.exe"
 	Delete "$INSTDIR\Usermanual.pdf"
 	Delete "$INSTDIR\libprotobuf.lib"
-        Delete "$INSTDIR\QtCore4.dll"
-        Delete "$INSTDIR\QtGui4.dll"
-        Delete "$INSTDIR\QtNetwork4.dll"
-        Delete "$INSTDIR\QtSvg4.dll"
-        Delete "$INSTDIR\QtXml4.dll"
+	Delete "$INSTDIR\QtCore4.dll"
+	Delete "$INSTDIR\QtGui4.dll"
+	Delete "$INSTDIR\QtNetwork4.dll"
+	Delete "$INSTDIR\QtSvg4.dll"
+	Delete "$INSTDIR\QtXml4.dll"
 	Delete "$INSTDIR\QtMultimedia4.dll"
-        RMDir "$INSTDIR"
+	RMDir "$INSTDIR"
 
 	RMDir /r "$SMPROGRAMS\Cockatrice"
-        
-        DeleteRegKey HKCU "Software\Cockatrice"
-        DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
+
+	DeleteRegKey HKCU "Software\Cockatrice"
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
 SectionEnd
 
 LangString DESC_SecApplication ${LANG_ENGLISH} "Cockatrice program files"
 LangString DESC_SecUpdateConfig ${LANG_ENGLISH} "Update the paths in the application settings according to the installation paths."
 LangString DESC_SecStartMenu ${LANG_ENGLISH} "Create start menu items for Cockatrice and Oracle."
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-        !insertmacro MUI_DESCRIPTION_TEXT ${SecApplication} $(DESC_SecApplication)
-        !insertmacro MUI_DESCRIPTION_TEXT ${SecUpdateConfig} $(DESC_SecUpdateConfig)
-        !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_SecStartMenu)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecApplication} $(DESC_SecApplication)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecUpdateConfig} $(DESC_SecUpdateConfig)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_SecStartMenu)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END