From f7635f9e4936ac96e715a2ef447a6a0ce087e71b Mon Sep 17 00:00:00 2001 From: Daenyth Date: Mon, 23 Jun 2014 21:12:25 -0400 Subject: [PATCH 1/3] Don't recursive remove program files/cockatrice. This should prevent deleting old deck files --- nsis/cockatrice.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi index 33cc496b..2cce2f5e 100644 --- a/nsis/cockatrice.nsi +++ b/nsis/cockatrice.nsi @@ -115,7 +115,7 @@ SetShellVarContext all Delete "$INSTDIR\QtMultimedia4.dll" RMDir "$INSTDIR" - RMDir /r "$SMPROGRAMS\Cockatrice" + RMDir "$SMPROGRAMS\Cockatrice" DeleteRegKey HKCU "Software\Cockatrice" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" From f1e6aebabae4669652b6c5f03b7305b1be2c6306 Mon Sep 17 00:00:00 2001 From: Daenyth Date: Mon, 23 Jun 2014 21:21:08 -0400 Subject: [PATCH 2/3] Set cockatrice path settings to use appdata instead of instdir Putting user stuff in program files is bad --- nsis/cockatrice.nsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi index 2cce2f5e..ede4c05d 100644 --- a/nsis/cockatrice.nsi +++ b/nsis/cockatrice.nsi @@ -1,7 +1,7 @@ !include "MUI2.nsh" !include "FileFunc.nsh" -!define /date TIMESTAMP "%Y%m%d" +!define /date TIMESTAMP "%Y%m%d" !searchparse /file ../build/cockatrice/version_string.cpp '= "' VERSION '";' Name "Cockatrice" @@ -52,7 +52,7 @@ Section "Application" SecApplication SetOutPath "$INSTDIR\zonebg" File /r ..\zonebg\*.* - + SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins\codecs" File "${QTDIR}\plugins\codecs\qcncodecs4.dll" @@ -67,7 +67,7 @@ Section "Application" SecApplication SetOutPath "$INSTDIR\sounds" File /r ..\sounds\*.* - + SetOutPath "$INSTDIR\translations" File /r ..\build\cockatrice\*.qm @@ -83,10 +83,10 @@ Section "Application" SecApplication SectionEnd Section "Update configuration" SecUpdateConfig - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$INSTDIR\cards.xml" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$INSTDIR\decks" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$INSTDIR\pics" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$INSTDIR\sounds" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$APPDATA\cards.xml" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$APPDATA\decks" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$APPDATA\pics" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$APPDATA\sounds" SectionEnd Section "Start menu item" SecStartMenu From fc599972f3449f3b4ac98ac93a3a44dd96be1680 Mon Sep 17 00:00:00 2001 From: Daenyth Date: Mon, 23 Jun 2014 21:25:09 -0400 Subject: [PATCH 3/3] Write to APPDATA/Cockatrice, not APPDATA --- nsis/cockatrice.nsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi index ede4c05d..88e7bdab 100644 --- a/nsis/cockatrice.nsi +++ b/nsis/cockatrice.nsi @@ -83,10 +83,10 @@ Section "Application" SecApplication SectionEnd Section "Update configuration" SecUpdateConfig - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$APPDATA\cards.xml" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$APPDATA\decks" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$APPDATA\pics" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$APPDATA\sounds" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$APPDATA\Cockatrice\cards.xml" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$APPDATA\Cockatrice\decks" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$APPDATA\Cockatrice\pics" + WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$APPDATA\Cockatrice\sounds" SectionEnd Section "Start menu item" SecStartMenu