I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

Don't pass an ArgumentList unless an ArgumentList exists

Browse Source
This commit is contained in:
idk
2022-05-18 11:30:48 -04:00
parent fa05c5f1cc
commit ea8788e1c8
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nsis/i2pbrowser-installer-wrapper.nsi
View File

@@ -148,6 +148,12 @@ Section Install
${EndIf} ${EndIf}
${GetOptions} $CMDLINE "/p" $PARENTOPTIONS ${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 # set the installation directory as the destination for the following actions
createDirectory $INSTDIR createDirectory $INSTDIR
SetOutPath $INSTDIR SetOutPath $INSTDIR
@@ -155,7 +161,7 @@ Section Install
UserInfo::GetAccountType UserInfo::GetAccountType
pop $0 pop $0
${If} $I2PINSTEXE != "${I2PINSTEXE_USERMODE}" ${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} ${Else}
ExecShell open "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}-wrapped.exe $PARENTOPTIONS" ExecShell open "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}-wrapped.exe $PARENTOPTIONS"
${EndIf} ${EndIf}

7
src/nsis/i2pbrowser-installer.nsi
View File

@@ -345,10 +345,13 @@ FunctionEnd
# start default section # start default section
Section Install Section Install
${GetOptions} $CMDLINE "/p" $PARENTOPTIONS ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
${If} "${PARENTOPTIONS}" != ""
StrCpy $PARENTOPTIONS "-ArgumentList '${PARENTOPTIONS}'"
${EndIf}
${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe" ${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" ${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} ${Else}
Call installerFunction Call installerFunction
${EndIf} ${EndIf}