mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

bin/brew: fix prioritisation of system env files

Browse Source 
Fixes #18925.
This commit is contained in:
Carlo Cabrera 2024-12-13 06:19:16 +08:00 committed by Carlo Cabrera
parent 9783ab062c
commit 2a3169da76
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/brew
View File

@ -131,12 +131,12 @@ export_homebrew_env_file() {
} }
# First, load the system-wide configuration. # First, load the system-wide configuration.
export_homebrew_env_file "/etc/homebrew/brew.env"
unset SYSTEM_ENV_TAKES_PRIORITY unset SYSTEM_ENV_TAKES_PRIORITY
if [[ -n "${HOMEBREW_SYSTEM_ENV_TAKES_PRIORITY-}" ]] if [[ -n "${HOMEBREW_SYSTEM_ENV_TAKES_PRIORITY-}" ]]
then then
SYSTEM_ENV_TAKES_PRIORITY="1" SYSTEM_ENV_TAKES_PRIORITY="1"
else
export_homebrew_env_file "/etc/homebrew/brew.env"
fi fi
# Next, load the prefix configuration # Next, load the prefix configuration
@ -152,7 +152,7 @@ fi
export_homebrew_env_file "${HOMEBREW_USER_CONFIG_HOME}/brew.env" export_homebrew_env_file "${HOMEBREW_USER_CONFIG_HOME}/brew.env"
# If the system configuration takes priority, load it last. # If the system configuration takes priority, load it again to override any previous settings.
if [[ -n "${SYSTEM_ENV_TAKES_PRIORITY-}" ]] if [[ -n "${SYSTEM_ENV_TAKES_PRIORITY-}" ]]
then then
export_homebrew_env_file "/etc/homebrew/brew.env" export_homebrew_env_file "/etc/homebrew/brew.env"