From a73ef3affdd78b487af9acf239572418b222f72a Mon Sep 17 00:00:00 2001 From: Matthew Bowra-Dean Date: Wed, 8 Sep 2010 22:21:41 +1200 Subject: [PATCH] Windows installer remembers previous install location. --- packaging/windows/OpenRA.nsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 5b0312c60f..af211e2f40 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -22,13 +22,15 @@ Name "OpenRA" OutFile "OpenRA.exe" InstallDir $PROGRAMFILES\OpenRA +InstallDirRegKey HKLM "Software\OpenRA" "InstallDir" + SetCompressor lzma !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "${SRCDIR}\COPYING" !insertmacro MUI_PAGE_DIRECTORY -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenRA" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !define MUI_STARTMENUPAGE_DEFAULTFOLDER "OpenRA" @@ -38,9 +40,7 @@ Var StartMenuFolder !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_INSTFILES -;!insertmacro MUI_PAGE_FINISH -;!insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -50,6 +50,10 @@ Var StartMenuFolder ;*************************** ;Section Definitions ;*************************** +Section "-Reg" Reg + WriteRegStr HKLM "Software\OpenRA" "InstallDir" $INSTDIR +SectionEnd + Section "Client" Client SetOutPath "$INSTDIR" File "${SRCDIR}\OpenRA.Game.exe" @@ -260,7 +264,7 @@ Function ${UN}Clean !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder RMDir /r "$SMPROGRAMS\$StartMenuFolder" - DeleteRegKey HKCU "Software\OpenRA" + ;DeleteRegKey HKCU "Software\OpenRA" FunctionEnd !macroend