From ea8788e1c85e71344243bb24355cb0bf83e97d3a Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 18 May 2022 11:30:48 -0400
Subject: [PATCH] Don't pass an ArgumentList unless an ArgumentList exists

---
 src/nsis/i2pbrowser-installer-wrapper.nsi | 8 +++++++-
 src/nsis/i2pbrowser-installer.nsi         | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/nsis/i2pbrowser-installer-wrapper.nsi b/src/nsis/i2pbrowser-installer-wrapper.nsi
index 76853a8..7a78960 100644
--- a/src/nsis/i2pbrowser-installer-wrapper.nsi
+++ b/src/nsis/i2pbrowser-installer-wrapper.nsi
@@ -148,6 +148,12 @@ Section Install
     ${EndIf}
     ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
 
+    # if PARENTOPTIONS is not blank, prepend PARENTOPTIONS string with -ArgumentList
+    ${If} "${PARENTOPTIONS}" != ""
+        StrCpy $PARENTOPTIONS "-ArgumentList '${PARENTOPTIONS}'"
+    ${EndIf}
+
+
     # set the installation directory as the destination for the following actions
     createDirectory $INSTDIR
     SetOutPath $INSTDIR
@@ -155,7 +161,7 @@ Section Install
     UserInfo::GetAccountType
     pop $0
     ${If} $I2PINSTEXE != "${I2PINSTEXE_USERMODE}"
-        ExecShell open "powershell -Command Start-Process .\I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}-wrapped.exe -Verb RunAs -Wait -ArgumentList '$PARENTOPTIONS'"
+        ExecShell open "powershell -Command Start-Process .\I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}-wrapped.exe -Verb RunAs -Wait $PARENTOPTIONS"
     ${Else}
         ExecShell open "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}-wrapped.exe $PARENTOPTIONS"
     ${EndIf}
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 5b072a9..260640e 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -345,10 +345,13 @@ FunctionEnd
 # start default section
 Section Install
     ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
+    ${If} "${PARENTOPTIONS}" != ""
+        StrCpy $PARENTOPTIONS "-ArgumentList '${PARENTOPTIONS}'"
+    ${EndIf}
     ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
-        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs -ArgumentList '$PARENTOPTIONS'"
+        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
     ${ElseIf} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
-        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs -ArgumentList '$PARENTOPTIONS'"
+        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
     ${Else}
         Call installerFunction
     ${EndIf}