diff options
| author | Mike McQuaid | 2017-11-27 09:32:28 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-27 09:32:28 +0000 |
| commit | e41a0a3b819ff0dcc8d01a70b589288183ec17bf (patch) | |
| tree | 4e4e015272f2117d97e685032a64913dbbfd0197 /Library/Homebrew/cmd | |
| parent | 323aaa03834484f0b6456d5598c6b579adae6549 (diff) | |
| parent | a19d0708a4888f42d8e5d1ff082a7a5aed73279e (diff) | |
| download | brew-e41a0a3b819ff0dcc8d01a70b589288183ec17bf.tar.bz2 | |
Merge pull request #3482 from MikeMcQuaid/homebrew-curl
Allow optionally using Homebrew's curl
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 3507fa92b..609e4094a 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -383,14 +383,15 @@ 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 + brew install curl + fi + if ! git --version >/dev/null 2>&1 then - # we need a new enough curl to install git - if [[ -n "$HOMEBREW_SYSTEM_CURL_TOO_OLD" && - ! -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] - then - brew install curl - fi # we cannot install brewed git if homebrew/core is unavailable. [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && brew install git unset GIT_EXECUTABLE |