admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew.sh: fix HOMEBREW_INSTALL_FROM_API logic.

Browse Source 
Ensure that we handle this a bit more correctly so it's unset more often.
This commit is contained in:
Mike McQuaid 2023-02-03 09:59:06 +00:00
parent 820ec5411f
commit bdbcf094fa
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/brew.sh
View File

@ -774,16 +774,17 @@ fi
# folks who haven't run a HOMEBREW_DEVELOPER_COMMAND if they are in a default # folks who haven't run a HOMEBREW_DEVELOPER_COMMAND if they are in a default
# prefix and on a supported macOS version. # prefix and on a supported macOS version.
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" && if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" &&
-z "${HOMEBREW_INSTALL_FROM_API}" &&
-z "${HOMEBREW_DEVELOPER_COMMAND}" ]] && -z "${HOMEBREW_DEVELOPER_COMMAND}" ]] &&
[[ -z "${HOMEBREW_MACOS_VERSION_NUMERIC}" || [[ -z "${HOMEBREW_MACOS_VERSION_NUMERIC}" ||
"${HOMEBREW_MACOS_VERSION_NUMERIC}" -ge "110000" ]] && "${HOMEBREW_MACOS_VERSION_NUMERIC}" -ge "110000" ]] &&
[[ "${HOMEBREW_PREFIX}" == "/usr/local" || [[ "${HOMEBREW_PREFIX}" == "/usr/local" ||
"${HOMEBREW_PREFIX}" == "/opt/homebrew" || "${HOMEBREW_PREFIX}" == "/opt/homebrew" ||
"${HOMEBREW_PREFIX}" == "/home/linuxbrew/.linuxbrew" ]] && "${HOMEBREW_PREFIX}" == "/home/linuxbrew/.linuxbrew" ]]
[[ -n "${HOMEBREW_DEV_CMD_RUN}" || -n "${HOMEBREW_DEVELOPER}" ]] then
if [[ -n "${HOMEBREW_DEV_CMD_RUN}" || -n "${HOMEBREW_DEVELOPER}" ]]
then then
export HOMEBREW_INSTALL_FROM_API=1 export HOMEBREW_INSTALL_FROM_API=1
fi
else else
unset HOMEBREW_INSTALL_FROM_API unset HOMEBREW_INSTALL_FROM_API
fi fi