diff options
| author | Mike McQuaid | 2017-11-07 08:01:51 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-11-07 08:01:51 +0000 |
| commit | 5f301755c0ee06689981197e7aa7d4c7d95434a2 (patch) | |
| tree | a0f370154faff1d87204737c7638aa636b9ac277 | |
| parent | 2ad17993086af7ceb20123a8ca26e7f84c2311d6 (diff) | |
| download | brew-5f301755c0ee06689981197e7aa7d4c7d95434a2.tar.bz2 | |
Use HOMEBREW_AUTO_UPDATE_CHECKED variable.
Rather than reusing `HOMEBREW_NO_AUTO_UPDATE` to indicate that we've
already made a check. This allows `HOMEBREW_NO_AUTO_UPDATE` to be
displayed properly by `brew config`.
| -rw-r--r-- | Library/Homebrew/brew.sh | 3 | ||||
| -rw-r--r-- | Library/Homebrew/system_config.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 1e2b0f3ed..37fa7ed23 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -312,6 +312,7 @@ update-preinstall-timer() { update-preinstall() { [[ -z "$HOMEBREW_HELP" ]] || return [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return + [[ -z "$HOMEBREW_AUTO_UPDATE_CHECKED" ]] || return [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]] @@ -346,7 +347,7 @@ update-preinstall() { fi # 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" ]] diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb index e7e60c985..b98d527c1 100644 --- a/Library/Homebrew/system_config.rb +++ b/Library/Homebrew/system_config.rb @@ -181,6 +181,7 @@ class SystemConfig HOMEBREW_ANALYTICS_ID HOMEBREW_ANALYTICS_USER_UUID + HOMEBREW_AUTO_UPDATE_CHECKED HOMEBREW_BREW_FILE HOMEBREW_COMMAND_DEPTH HOMEBREW_CURL |