aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-08-10 14:18:08 +0100
committerMike McQuaid2016-08-10 15:37:04 +0100
commit1a240cd52a48a66e213706eba88055f6fd6b0f67 (patch)
tree6c1e4589d3354fb097fd153dbf83b25ccbd0f790 /Library
parent11116c2467710c9b3df37164dce2bb012a205d33 (diff)
downloadbrew-1a240cd52a48a66e213706eba88055f6fd6b0f67.tar.bz2
Tweak HOMEBREW_NO_AUTO_UPDATE handling.
This can just live in `brew.sh` and then it doesn’t need repeated in all the other places.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/brew.sh3
-rw-r--r--Library/Homebrew/cmd/update.sh2
-rw-r--r--Library/Homebrew/dev-cmd/test-bot.rb1
3 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index ada877baa..edbc8db05 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -235,6 +235,9 @@ update-preinstall() {
then
brew update --preinstall
fi
+
+ # If we've checked for updates, we don't need to check again.
+ export HOMEBREW_NO_AUTO_UPDATE="1"
}
if [[ -n "$HOMEBREW_BASH_COMMAND" ]]
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 2e40d1d42..3fa5ba1fb 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -359,8 +359,6 @@ EOS
# only allow one instance of brew update
lock update
- # prevent recursive updates
- export HOMEBREW_NO_AUTO_UPDATE="1"
git_init_if_necessary
# rename Taps directories
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 94775e98d..e3ba7e41e 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -920,7 +920,6 @@ module Homebrew
end
ENV["HOMEBREW_DEVELOPER"] = "1"
- ENV["HOMEBREW_NO_AUTO_UPDATE"] = "1"
ENV["HOMEBREW_SANDBOX"] = "1"
ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_TWO
ENV["HOMEBREW_NO_EMOJI"] = "1"