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 | |
| 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
| -rw-r--r-- | Library/Homebrew/brew.sh | 10 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 13 | ||||
| -rw-r--r-- | manpages/brew-cask.1 | 2 | ||||
| -rw-r--r-- | manpages/brew.1 | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 37fa7ed23..bd88a23f5 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -110,16 +110,18 @@ then # Don't change this from Mac OS X to match what macOS itself does in Safari on 10.12 HOMEBREW_OS_USER_AGENT_VERSION="Mac OS X $HOMEBREW_MACOS_VERSION" + # The system Curl is too old for some modern HTTPS certificates on + # older macOS versions. printf -v HOMEBREW_MACOS_VERSION_NUMERIC "%02d%02d%02d" ${HOMEBREW_MACOS_VERSION//./ } if [[ "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "101000" ]] then HOMEBREW_SYSTEM_CURL_TOO_OLD="1" + HOMEBREW_FORCE_BREWED_CURL="1" fi - # The system Curl is too old for some modern HTTPS certificates on - # older macOS versions. - if [[ -n "$HOMEBREW_SYSTEM_CURL_TOO_OLD" && - -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] + if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" && + -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] && + "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null then HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl" fi 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 diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1 index b34249d69..720fa4154 100644 --- a/manpages/brew-cask.1 +++ b/manpages/brew-cask.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW\-CASK" "1" "October 2017" "Homebrew" "brew-cask" +.TH "BREW\-CASK" "1" "November 2017" "Homebrew" "brew-cask" . .SH "NAME" \fBbrew\-cask\fR \- a friendly binary installer for macOS diff --git a/manpages/brew.1 b/manpages/brew.1 index bf0348658..449d20a3e 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW" "1" "October 2017" "Homebrew" "brew" +.TH "BREW" "1" "November 2017" "Homebrew" "brew" . .SH "NAME" \fBbrew\fR \- The missing package manager for macOS |