diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-10-21 11:16:19 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-10-21 11:16:19 +0200 |
| commit | c4c4189933f8d610e501cfc8c86dfbe52c4c160d (patch) | |
| tree | bf87d0535fba162830cc53483b189cf781bb1868 | |
| parent | 38feb30d4e1dd0126fd4944fa47d4f445213aed4 (diff) | |
| download | UXP-c4c4189933f8d610e501cfc8c86dfbe52c4c160d.tar UXP-c4c4189933f8d610e501cfc8c86dfbe52c4c160d.tar.gz UXP-c4c4189933f8d610e501cfc8c86dfbe52c4c160d.tar.lz UXP-c4c4189933f8d610e501cfc8c86dfbe52c4c160d.tar.xz UXP-c4c4189933f8d610e501cfc8c86dfbe52c4c160d.zip | |
Issue #1229 - Remove fallback for $INSTDIR
This resolves #1229
| -rwxr-xr-x | toolkit/mozapps/installer/windows/nsis/common.nsh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 36e228797..57a25df9d 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -5577,21 +5577,6 @@ StrCpy $INSTDIR "$R9" !endif - ; If the user doesn't have write access to the installation directory set - ; the installation directory to a subdirectory of the All Users application - ; directory and if the user can't write to that location set the installation - ; directory to a subdirectory of the users local application directory - ; (e.g. non-roaming). - ${CanWriteToInstallDir} $R9 - StrCmp "$R9" "false" +1 finish_check_install_dir - - SetShellVarContext all ; Set SHCTX to All Users - StrCpy $INSTDIR "$APPDATA\${BrandFullName}\" - ${CanWriteToInstallDir} $R9 - StrCmp "$R9" "false" +2 +1 - StrCpy $INSTDIR "$LOCALAPPDATA\${BrandFullName}\" - - finish_check_install_dir: IfFileExists "$INSTDIR" +3 +1 Pop $R9 Return |