From 76466f66d26ef721186fcf2b555616db979f2861 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 7 Feb 2023 14:33:33 +0800 Subject: [PATCH] brew.sh: add `bump` to `HOMEBREW_NO_INSTALL_FROM_API` commands `brew bump` relies on `livecheck`, which we don't want to query the API for. Also, some small refactoring: 1. Declare the list of commands we want to set `HOMEBREW_NO_INSTALL_FROM_API` for as an array. 2. Only check against this list when the command being run is a developer command, to avoid checking the list when we know we're not running a dev command. --- Library/Homebrew/brew.sh | 47 +++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index fed73888d4..fb373a65f8 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -755,6 +755,33 @@ if [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.sh" ]] || [[ -f "${HOMEBREW_LIBRARY}/Homebrew/dev-cmd/${HOMEBREW_COMMAND}.rb" ]] then export HOMEBREW_DEVELOPER_COMMAND="1" + + NO_INSTALL_FROM_API_COMMANDS=( + audit + bottle + bump-cask-pr + bump-formula-pr + bump-revision + bump-unversioned-casks + bump + cat + create + edit + extract + formula + livecheck + pr-pull + pr-upload + test + update-python-resources + ) + + if [[ " ${NO_INSTALL_FROM_API_COMMANDS[*]} " == *" ${HOMEBREW_COMMAND} "* ]] + then + export HOMEBREW_NO_INSTALL_FROM_API=1 + fi + + unset NO_INSTALL_FROM_API_COMMANDS fi if [[ -n "${HOMEBREW_DEVELOPER_COMMAND}" && -z "${HOMEBREW_DEVELOPER}" ]] @@ -772,26 +799,6 @@ To turn developer mode off, run $(bold "brew developer off") export HOMEBREW_DEV_CMD_RUN="1" fi -if [[ "${HOMEBREW_COMMAND}" == "audit" ]] || - [[ "${HOMEBREW_COMMAND}" == "bottle" ]] || - [[ "${HOMEBREW_COMMAND}" == "bump-cask-pr" ]] || - [[ "${HOMEBREW_COMMAND}" == "bump-formula-pr" ]] || - [[ "${HOMEBREW_COMMAND}" == "bump-revision" ]] || - [[ "${HOMEBREW_COMMAND}" == "bump-unversioned-casks" ]] || - [[ "${HOMEBREW_COMMAND}" == "cat" ]] || - [[ "${HOMEBREW_COMMAND}" == "create" ]] || - [[ "${HOMEBREW_COMMAND}" == "edit" ]] || - [[ "${HOMEBREW_COMMAND}" == "extract" ]] || - [[ "${HOMEBREW_COMMAND}" == "formula" ]] || - [[ "${HOMEBREW_COMMAND}" == "livecheck" ]] || - [[ "${HOMEBREW_COMMAND}" == "pr-pull" ]] || - [[ "${HOMEBREW_COMMAND}" == "pr-upload" ]] || - [[ "${HOMEBREW_COMMAND}" == "test" ]] || - [[ "${HOMEBREW_COMMAND}" == "update-python-resources" ]] -then - export HOMEBREW_NO_INSTALL_FROM_API=1 -fi - if [[ -f "${HOMEBREW_LIBRARY}/Homebrew/cmd/${HOMEBREW_COMMAND}.sh" ]] then HOMEBREW_BASH_COMMAND="${HOMEBREW_LIBRARY}/Homebrew/cmd/${HOMEBREW_COMMAND}.sh"