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

Merge pull request #5898 from MikeMcQuaid/no-autoupdate-no-params

Browse Source 
brew.sh: don’t always autoupdate with no params.
This commit is contained in:
Mike McQuaid 2019-03-21 19:06:29 +00:00 committed by GitHub
commit 3e64641512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Library/Homebrew/brew.sh
View File

@ -416,8 +416,22 @@ update-preinstall() {
[[ -z "$HOMEBREW_HELP" ]] || return [[ -z "$HOMEBREW_HELP" ]] || return
[[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return
[[ -z "$HOMEBREW_AUTO_UPDATING" ]] || return [[ -z "$HOMEBREW_AUTO_UPDATING" ]] || return
[[ -z "$HOMEBREW_AUTO_UPDATE_CHECKED" ]] || return
[[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return
[[ -z "$HOMEBREW_AUTO_UPDATE_CHECKED" ]] || return
# If we've checked for updates, we don't need to check again.
export HOMEBREW_AUTO_UPDATE_CHECKED="1"
if [[ "$HOMEBREW_COMMAND" = "cask" ]]
then
if [[ "$HOMEBREW_CASK_COMMAND" != "upgrade" && $HOMEBREW_ARG_COUNT -lt 3 ]]
then
return
fi
elif [[ "$HOMEBREW_COMMAND" != "upgrade" && $HOMEBREW_ARG_COUNT -lt 2 ]]
then
return
fi
if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" ||
"$HOMEBREW_COMMAND" = "bump-formula-pr" || "$HOMEBREW_COMMAND" = "bump-formula-pr" ||
@ -432,9 +446,6 @@ update-preinstall() {
timer_pid=$! timer_pid=$!
fi fi
# Allow auto-update migration now we have a fix in place (below in this function).
export HOMEBREW_ENABLE_AUTO_UPDATE_MIGRATION="1"
brew update --preinstall brew update --preinstall
if [[ -n "$timer_pid" ]] if [[ -n "$timer_pid" ]]
@ -445,15 +456,9 @@ update-preinstall() {
unset HOMEBREW_AUTO_UPDATING unset HOMEBREW_AUTO_UPDATING
# If we've checked for updates, we don't need to check again.
export HOMEBREW_AUTO_UPDATE_CHECKED="1"
# exec a new process to set any new environment variables. # exec a new process to set any new environment variables.
exec "$HOMEBREW_BREW_FILE" "$@" exec "$HOMEBREW_BREW_FILE" "$@"
fi fi
# If we've checked for updates, we don't need to check again.
export HOMEBREW_AUTO_UPDATE_CHECKED="1"
} }
if [[ -n "$HOMEBREW_BASH_COMMAND" ]] if [[ -n "$HOMEBREW_BASH_COMMAND" ]]