From 7e8d3312122d12b320acbdb749be1fd6e89f0954 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 10 Mar 2021 07:57:23 +0100
Subject: [PATCH] minor simplification of installer

---
 resources/nsis/NSIS.definitions.nsh.in | 1 -
 resources/nsis/NSIS.template.in        | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/resources/nsis/NSIS.definitions.nsh.in b/resources/nsis/NSIS.definitions.nsh.in
index 8f3026c05..546f7364e 100755
--- a/resources/nsis/NSIS.definitions.nsh.in
+++ b/resources/nsis/NSIS.definitions.nsh.in
@@ -4,7 +4,6 @@
 !define APP_VERSION "@APP_VERSION@"
 !define APP_NAME "@APP_NAME@"
 !define EXE_NAME "@EXE_NAME@"
-;!define README_FILE "README"
 !define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL"
 !define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
 !define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in
index f8add5279..f0452edd1 100755
--- a/resources/nsis/NSIS.template.in
+++ b/resources/nsis/NSIS.template.in
@@ -23,7 +23,7 @@ SetCompressor /SOLID /FINAL lzma
 
 ; Default installation folder.
 InstallDir "C:\${APP_NAME}"
-InstallDirRegKey HKCU "Software\${APP_NAME}" "Install Directory"
+InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation"
 
 ; Require administrator access.
 RequestExecutionLevel admin
@@ -131,9 +131,6 @@ NotInstalled:
   ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /passive /quiet'
   Delete "$INSTDIR\vc_redist.x64.exe"
 
-  ; Store installation folder.
-  WriteRegStr HKCU "Software\${APP_NAME}" "Install Directory" $INSTDIR
-  
   ; Create uninstaller.
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -141,6 +138,7 @@ NotInstalled:
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayName" "${APP_NAME}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayIcon" "$INSTDIR\${EXE_NAME}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayVersion" "${APP_VERSION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
 SectionEnd