From fb13af8edfd5845628ae5f2729cc33446416f300 Mon Sep 17 00:00:00 2001
From: Cyano Hao <c@cyano.cn>
Date: Sun, 28 Apr 2024 16:46:33 +0800
Subject: [PATCH] fix per-user context in windows installer script (#402)

---
 .../windows/installer-scripts/redpanda.nsi    | 21 ++++++++++++-------
 platform/windows/installer-scripts/utils.nsh  |  5 -----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/platform/windows/installer-scripts/redpanda.nsi b/platform/windows/installer-scripts/redpanda.nsi
index a9bb7470..c9d72e58 100644
--- a/platform/windows/installer-scripts/redpanda.nsi
+++ b/platform/windows/installer-scripts/redpanda.nsi
@@ -333,13 +333,6 @@ Function .onInit
 	
   IfFileExists "$APPDATA\Dev-Cpp\devcpp.cfg" 0 +2 # deprecated config file
     SectionSetFlags ${SectionConfig} ${SF_SELECTED}
-
-  SetShellVarContext all
-  !if "${ARCH}" == "x86"
-    SetRegView 32
-  !else
-    SetRegView 64
-  !endif
 FunctionEnd
 
 Function .onSelChange
@@ -350,8 +343,21 @@ FunctionEnd
 Function myGuiInit
   !insertmacro CheckOsArch
   !insertmacro CheckOsBuild
+
+  ; V2 always installs for all users
+  SetShellVarContext all
   !insertmacro CheckV2Installer
 
+  ; for unprivileged per-user (mode selection will be skipped)
+  ; correct context will be set later if per-machine chosen
+  SetShellVarContext current
+
+  !if "${ARCH}" == "x86"
+    SetRegView 32
+  !else
+    SetRegView 64
+  !endif
+
   !insertmacro SectionAction_CheckMingw64
   !insertmacro SectionAction_CheckCompress
 FunctionEnd
@@ -360,7 +366,6 @@ Function un.onInit
   !insertmacro MULTIUSER_UNINIT
   !insertmacro MUI_UNGETLANGUAGE
 
-  SetShellVarContext all
   !if "${ARCH}" == "x86"
     SetRegView 32
   !else
diff --git a/platform/windows/installer-scripts/utils.nsh b/platform/windows/installer-scripts/utils.nsh
index 42dd9d64..dc069620 100644
--- a/platform/windows/installer-scripts/utils.nsh
+++ b/platform/windows/installer-scripts/utils.nsh
@@ -62,11 +62,6 @@ Var /GLOBAL sectionDepTemp
   Call UninstallV2
   SetRegView 64
   Call UninstallV2
-  !if "${ARCH}" == "x86"
-    SetRegView 32
-  !else
-    SetRegView 64
-  !endif
 !macroend
 
 !macro CheckPreviousInstaller