From c64f0fe632e3edfc9bb7c09606a8488d76c84bf9 Mon Sep 17 00:00:00 2001 From: idk Date: Fri, 25 Mar 2022 15:04:15 -0400 Subject: [PATCH] enable a user-mode install of I2P jpackages --- src/nsis/i2pbrowser-installer.nsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi index 8489d9f..0ed1370 100644 --- a/src/nsis/i2pbrowser-installer.nsi +++ b/src/nsis/i2pbrowser-installer.nsi @@ -27,6 +27,8 @@ SetOverwrite on !define I2PINSTEXE !define I2PINSTEXE32 "$PROGRAMFILES32\i2p" !define I2PINSTEXE64 "$PROGRAMFILES64\i2p" +!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p" + !define RAM_NEEDED_FOR_64BIT 0x80000000 @@ -144,10 +146,12 @@ Page instfiles !include i2pbrowser-mozcompat.nsi Function .onInit + StrCpy $I2PINSTEXE "${I2PINSTEXE64}" UserInfo::GetAccountType pop $0 ${If} $0 != "admin" StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}" + StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}" ${EndIf} !insertmacro MUI_LANGDLL_DISPLAY Call ShouldInstall64Bit @@ -177,13 +181,16 @@ Function .onInit StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\" ${EndIf} ${EndIf} - StrCpy $I2PINSTEXE "${I2PINSTEXE64}" ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe" StrCpy $I2PINSTEXE "${I2PINSTEXE32}" ${EndIf} ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe" StrCpy $I2PINSTEXE "${I2PINSTEXE64}" ${EndIf} + ${If} ${FileExists} "${I2PINSTEXE_USERMODE}\i2p.exe" + StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}" + ${EndIf} + # look for user installs FunctionEnd Function firefoxDetect