From af3e1696b854b978d3522bea10cc61ed3442334f Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 18 May 2022 12:35:55 -0400
Subject: [PATCH] detect admin installs even when installing in adminless mode

---
 src/nsis/i2pbrowser-installer.nsi | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 0d3f07b..c0c93bb 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -154,14 +154,12 @@ Function .onInit
     ${If} $0 != "admin"
         StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
         StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
-    ${ElseIf} $0 == "admin"
+    ${EndIf}
+    ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
+        StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
+    ${EndIf}
+    ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
         StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
-        ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
-            StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
-        ${EndIf}
-        ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
-            StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
-        ${EndIf}
     ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
     Call ShouldInstall64Bit
@@ -346,7 +344,7 @@ FunctionEnd
 Function elevatorCallback
     ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
     ${If} "${PARENTOPTIONS}" != ""
-        StrCpy $PARENTOPTIONS "-ArgumentList '${PARENTOPTIONS}'"
+        StrCpy $PARENTOPTIONS "-ArgumentList '$PARENTOPTIONS'"
     ${EndIf}
     ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
         ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"