From 1a240cd52a48a66e213706eba88055f6fd6b0f67 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 10 Aug 2016 14:18:08 +0100
Subject: [PATCH] Tweak HOMEBREW_NO_AUTO_UPDATE handling.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This can just live in `brew.sh` and then it doesn鈥檛 need repeated in
all the other places.
---
Library/Homebrew/brew.sh | 3 +++
Library/Homebrew/cmd/update.sh | 2 --
Library/Homebrew/dev-cmd/test-bot.rb | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index ada877baa7..edbc8db059 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 2e40d1d428..3fa5ba1fb6 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 94775e98d8..e3ba7e41ef 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"
--
GitLab