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

Merge pull request #15780 from MikeMcQuaid/update_taps_properly

Browse Source 
`brew update` core/homebrew-cask taps properly
This commit is contained in:
Mike McQuaid 2023-07-28 12:05:53 +01:00 committed by GitHub
commit d664af7a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/brew.sh
View File

@ -313,11 +313,11 @@ auto-update() {
repo_fetch_heads=("${HOMEBREW_REPOSITORY}/.git/FETCH_HEAD") repo_fetch_heads=("${HOMEBREW_REPOSITORY}/.git/FETCH_HEAD")
# We might have done an auto-update recently, but not a core/cask clone auto-update. # We might have done an auto-update recently, but not a core/cask clone auto-update.
# So we check the core/cask clone FETCH_HEAD too. # So we check the core/cask clone FETCH_HEAD too.
if [[ -n "${HOMEBREW_UPDATE_CORE_TAP}" && -d "${HOMEBREW_CORE_REPOSITORY}/.git" ]] if [[ -n "${HOMEBREW_AUTO_UPDATE_CORE_TAP}" && -d "${HOMEBREW_CORE_REPOSITORY}/.git" ]]
then then
repo_fetch_heads+=("${HOMEBREW_CORE_REPOSITORY}/.git/FETCH_HEAD") repo_fetch_heads+=("${HOMEBREW_CORE_REPOSITORY}/.git/FETCH_HEAD")
fi fi
if [[ -n "${HOMEBREW_UPDATE_CASK_TAP}" && -d "${HOMEBREW_CASK_REPOSITORY}/.git" ]] if [[ -n "${HOMEBREW_AUTO_UPDATE_CASK_TAP}" && -d "${HOMEBREW_CASK_REPOSITORY}/.git" ]]
then then
repo_fetch_heads+=("${HOMEBREW_CASK_REPOSITORY}/.git/FETCH_HEAD") repo_fetch_heads+=("${HOMEBREW_CASK_REPOSITORY}/.git/FETCH_HEAD")
fi fi
@ -365,8 +365,8 @@ auto-update() {
unset AUTO_UPDATE_COMMANDS unset AUTO_UPDATE_COMMANDS
unset AUTO_UPDATE_CORE_TAP_COMMANDS unset AUTO_UPDATE_CORE_TAP_COMMANDS
unset AUTO_UPDATE_CASK_TAP_COMMANDS unset AUTO_UPDATE_CASK_TAP_COMMANDS
unset HOMEBREW_UPDATE_CORE_TAP unset HOMEBREW_AUTO_UPDATE_CORE_TAP
unset HOMEBREW_UPDATE_CASK_TAP unset HOMEBREW_AUTO_UPDATE_CASK_TAP
} }
##### #####
@ -877,7 +877,9 @@ AUTO_UPDATE_CORE_TAP_COMMANDS=(
if check-array-membership "${HOMEBREW_COMMAND}" "${AUTO_UPDATE_CORE_TAP_COMMANDS[@]}" if check-array-membership "${HOMEBREW_COMMAND}" "${AUTO_UPDATE_CORE_TAP_COMMANDS[@]}"
then then
export HOMEBREW_AUTO_UPDATE_COMMAND="1" export HOMEBREW_AUTO_UPDATE_COMMAND="1"
export HOMEBREW_UPDATE_CORE_TAP="1" export HOMEBREW_AUTO_UPDATE_CORE_TAP="1"
else
unset HOMEBREW_AUTO_UPDATE_CORE_TAP
fi fi
# Check for commands that should auto-update the homebrew-cask tap. # Check for commands that should auto-update the homebrew-cask tap.
@ -889,7 +891,9 @@ AUTO_UPDATE_CASK_TAP_COMMANDS=(
if check-array-membership "${HOMEBREW_COMMAND}" "${AUTO_UPDATE_CASK_TAP_COMMANDS[@]}" if check-array-membership "${HOMEBREW_COMMAND}" "${AUTO_UPDATE_CASK_TAP_COMMANDS[@]}"
then then
export HOMEBREW_AUTO_UPDATE_COMMAND="1" export HOMEBREW_AUTO_UPDATE_COMMAND="1"
export HOMEBREW_UPDATE_CASK_TAP="1" export HOMEBREW_AUTO_UPDATE_CASK_TAP="1"
else
unset HOMEBREW_AUTO_UPDATE_CORE_TAP
fi fi
# Disable Ruby options we don't need. # Disable Ruby options we don't need.

14
Library/Homebrew/cmd/update.sh
View File

@ -581,9 +581,10 @@ EOS
for DIR in "${HOMEBREW_REPOSITORY}" "${HOMEBREW_LIBRARY}"/Taps/*/* for DIR in "${HOMEBREW_REPOSITORY}" "${HOMEBREW_LIBRARY}"/Taps/*/*
do do
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]] && if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]] &&
[[ -z "${HOMEBREW_DEVELOPER}" && -z "${HOMEBREW_DEV_CMD_RUN}" || -n "${HOMEBREW_UPDATE_AUTO}" ]] && [[ -n "${HOMEBREW_UPDATE_AUTO}" || (-z "${HOMEBREW_DEVELOPER}" && -z "${HOMEBREW_DEV_CMD_RUN}") ]] &&
[[ ("${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" && -z "${HOMEBREW_UPDATE_CORE_TAP}") || [[ -n "${HOMEBREW_UPDATE_AUTO}" &&
("${DIR}" == "${HOMEBREW_CASK_REPOSITORY}" && -z "${HOMEBREW_UPDATE_CASK_TAP}") ]] (("${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" && -z "${HOMEBREW_AUTO_UPDATE_CORE_TAP}") ||
("${DIR}" == "${HOMEBREW_CASK_REPOSITORY}" && -z "${HOMEBREW_AUTO_UPDATE_CASK_TAP}")) ]]
then then
continue continue
fi fi
@ -743,9 +744,10 @@ EOS
for DIR in "${HOMEBREW_REPOSITORY}" "${HOMEBREW_LIBRARY}"/Taps/*/* for DIR in "${HOMEBREW_REPOSITORY}" "${HOMEBREW_LIBRARY}"/Taps/*/*
do do
if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]] && if [[ -z "${HOMEBREW_NO_INSTALL_FROM_API}" ]] &&
[[ -z "${HOMEBREW_DEVELOPER}" && -z "${HOMEBREW_DEV_CMD_RUN}" || -n "${HOMEBREW_UPDATE_AUTO}" ]] && [[ -n "${HOMEBREW_UPDATE_AUTO}" || (-z "${HOMEBREW_DEVELOPER}" && -z "${HOMEBREW_DEV_CMD_RUN}") ]] &&
[[ ("${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" && -z "${HOMEBREW_UPDATE_CORE_TAP}") || [[ -n "${HOMEBREW_UPDATE_AUTO}" &&
("${DIR}" == "${HOMEBREW_CASK_REPOSITORY}" && -z "${HOMEBREW_UPDATE_CASK_TAP}") ]] (("${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" && -z "${HOMEBREW_AUTO_UPDATE_CORE_TAP}") ||
("${DIR}" == "${HOMEBREW_CASK_REPOSITORY}" && -z "${HOMEBREW_AUTO_UPDATE_CASK_TAP}")) ]]
then then
continue continue
fi fi