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

detect admin installs even when installing in adminless mode

Browse Source
This commit is contained in:
idk
2022-05-18 12:35:55 -04:00
parent ca4bf67e19
commit af3e1696b8
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,14 +154,12 @@ Function .onInit
${If} $0 != "admin" ${If} $0 != "admin"
StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}" StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}" 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}" StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
${EndIf}
${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
${EndIf}
${EndIf} ${EndIf}
!insertmacro MUI_LANGDLL_DISPLAY !insertmacro MUI_LANGDLL_DISPLAY
Call ShouldInstall64Bit Call ShouldInstall64Bit
@@ -346,7 +344,7 @@ FunctionEnd
Function elevatorCallback Function elevatorCallback
${GetOptions} $CMDLINE "/p" $PARENTOPTIONS ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
${If} "${PARENTOPTIONS}" != "" ${If} "${PARENTOPTIONS}" != ""
StrCpy $PARENTOPTIONS "-ArgumentList '${PARENTOPTIONS}'" StrCpy $PARENTOPTIONS "-ArgumentList '$PARENTOPTIONS'"
${EndIf} ${EndIf}
${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe" ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS" ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"