commit 9305d5e3

sago007 · 2016-03-20 10:34
9305d5e3efd71f078995b1924a176065a944fba2 patch · browse files
parent a077dceb8064b0e635ade42fff916b9285d9f2b1

Small fixes to the Windows installer

Changed files

M	windows installer/install_script.nsi before

diff --git a/windows installer/install_script.nsi b/windows installer/install_script.nsi index 10d81e9..9561848 100644 --- a/windows installer/install_script.nsi +++ b/windows installer/install_script.nsi

@@ -5,7 +5,7 @@

!define PRODUCT_VERSION "2.0.0-SNAPSHOT"

!define PRODUCT_PUBLISHER "Poul Sander"

!define PRODUCT_WEB_SITE "http://www.blockattack.net"

-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\block_attack.exe"

+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\blockattack.exe"

!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

!define PRODUCT_UNINST_ROOT_KEY "HKLM"

!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"

@@ -82,7 +82,7 @@ SectionEnd

Section -Post

WriteUninstaller "$INSTDIR\uninst.exe"

- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\block_attack.exe"

+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\blockattack.exe"

WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\blockattack.exe"

@@ -225,6 +225,9 @@ Section Uninstall

Delete "$INSTDIR\res\puzzle.levels"

Delete "$INSTDIR\res\copy"

Delete "$INSTDIR\res\testPuzzles"

+ Delete "$INSTDIR\puzzles\puzzle.levels"

+ Delete "$INSTDIR\puzzles\copy"

+ Delete "$INSTDIR\puzzles\testPuzzles"

Delete "$INSTDIR\sound\counter.ogg"

Delete "$INSTDIR\sound\counterFinal.ogg"

Delete "$INSTDIR\sound\typing.ogg"

@@ -252,6 +255,7 @@ Section Uninstall

RMDir "$SMPROGRAMS\$ICONS_GROUP"

RMDir "$INSTDIR\sound"

RMDir "$INSTDIR\res"

+ RMDir "$INSTDIR\puzzles"

RMDir "$INSTDIR\music"

RMDir "$INSTDIR\gfx\garbage"

RMDir "$INSTDIR\gfx\counter"