From c3231a40953290cfc32037fcfb315cf8cc56fa93 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Wed, 25 Nov 2020 12:54:18 -0600
Subject: [PATCH] Apply Mike's suggestions
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
---
Library/Homebrew/cmd/update.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 581ba6a0e7..3068452a16 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -368,10 +368,11 @@ user account:
EOS
fi
+ # we may want to use a Homebrew curl
if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
! -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
then
- ohai "Installing Homebrew cURL"
+ # we cannot install a Homebrew cURL if homebrew/core is unavailable.
if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install curl
then
odie "Curl must be installed and in your PATH!"
@@ -382,7 +383,7 @@ EOS
[[ -n "$HOMEBREW_FORCE_BREWED_GIT" &&
! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]]
then
- ohai "Installing Homebrew Git"
+ # we cannot install a Homebrew Git if homebrew/core is unavailable.
if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install git
then
odie "Git must be installed and in your PATH!"
--
GitLab