Merge pull request #3435 from MikeMcQuaid/auto-update-checked

Use HOMEBREW_AUTO_UPDATE_CHECKED variable.
This commit is contained in:
Mike McQuaid 2017-11-07 08:26:19 +00:00 committed by GitHub
commit ccf933f31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -312,6 +312,7 @@ update-preinstall-timer() {
update-preinstall() { 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_UPDATE_CHECKED" ]] || return
[[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return
if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]] if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]]
@ -346,7 +347,7 @@ update-preinstall() {
fi fi
# If we've checked for updates, we don't need to check again. # If we've checked for updates, we don't need to check again.
export HOMEBREW_NO_AUTO_UPDATE="1" export HOMEBREW_AUTO_UPDATE_CHECKED="1"
} }
if [[ -n "$HOMEBREW_BASH_COMMAND" ]] if [[ -n "$HOMEBREW_BASH_COMMAND" ]]

View File

@ -181,6 +181,7 @@ class SystemConfig
HOMEBREW_ANALYTICS_ID HOMEBREW_ANALYTICS_ID
HOMEBREW_ANALYTICS_USER_UUID HOMEBREW_ANALYTICS_USER_UUID
HOMEBREW_AUTO_UPDATE_CHECKED
HOMEBREW_BREW_FILE HOMEBREW_BREW_FILE
HOMEBREW_COMMAND_DEPTH HOMEBREW_COMMAND_DEPTH
HOMEBREW_CURL HOMEBREW_CURL