diff options
| author | Mike McQuaid | 2018-02-20 11:07:48 +0000 |
|---|---|---|
| committer | GitHub | 2018-02-20 11:07:48 +0000 |
| commit | 2c84c04bd4eefc050f400659ff7e9dd1aba3cfb9 (patch) | |
| tree | 84dadd9905c9a8e2ac3a5cb3cd0916c47ddcb1a8 | |
| parent | c216eff44f0de9a9ef58920464723bf556c622aa (diff) | |
| parent | 84be0f82d4552b1c41c5ca1ad63c39df4a59f40f (diff) | |
| download | brew-2c84c04bd4eefc050f400659ff7e9dd1aba3cfb9.tar.bz2 | |
Merge pull request #3818 from MikeMcQuaid/curl-linux-tweaks
brew.sh: use system curl on Linux where possible.
| -rw-r--r-- | Library/Homebrew/brew.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index a9074a643..61d85ddd2 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -75,7 +75,6 @@ case "$HOMEBREW_SYSTEM" in Linux) HOMEBREW_LINUX="1" ;; esac -HOMEBREW_CURL="curl" if [[ -n "$HOMEBREW_MACOS" ]] then HOMEBREW_PROCESSOR="$(uname -p)" @@ -107,7 +106,6 @@ else [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)" : "${HOMEBREW_OS_VERSION:=$(uname -r)}" HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION" - HOMEBREW_FORCE_BREWED_CURL=1 if [[ -z "$HOMEBREW_CACHE" ]] then @@ -125,6 +123,8 @@ if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" && "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null then HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl" +else + HOMEBREW_CURL="curl" fi HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)" |