diff options
| author | Mike McQuaid | 2018-02-16 08:16:53 +0000 |
|---|---|---|
| committer | GitHub | 2018-02-16 08:16:53 +0000 |
| commit | ef1924e1f3f2becefe68e4ee6c3967eeee998fcf (patch) | |
| tree | 023d4d4e2495c0a1cca2a7c23e93f3417f3154f3 | |
| parent | 7f6e77226ab82fe2cb839d5f8788e2e348dd7b54 (diff) | |
| parent | 30d468978fb0d299f3faa4461c15e82102e0d3a5 (diff) | |
| download | brew-ef1924e1f3f2becefe68e4ee6c3967eeee998fcf.tar.bz2 | |
Merge pull request #3809 from maxim-belkin/brew-unix-1
brew.sh: changes from Linuxbrew (Linux fork)
| -rw-r--r-- | Library/Homebrew/brew.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 47064c61b..a9074a643 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -97,13 +97,6 @@ then HOMEBREW_FORCE_BREWED_CURL="1" fi - 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 - if [[ -z "$HOMEBREW_CACHE" ]] then HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew" @@ -114,6 +107,7 @@ 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 +119,14 @@ else fi fi fi + +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 + HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)" HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | awk '{print $1"/"$2}')" HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION" |