aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Belkin2018-02-15 11:43:20 -0600
committerMaxim Belkin2018-02-15 11:43:20 -0600
commite5f4160d3e7ca58f2d5f9d599246e051a32cbec4 (patch)
treebdd8ea6c8264625ce074a8715e080fb253e25d89
parent988e8054482c3458c387c5e589292144f2b26e50 (diff)
downloadbrew-e5f4160d3e7ca58f2d5f9d599246e051a32cbec4.tar.bz2
brew.sh: changes from Linuxbrew (Linux fork)
These fixes do two things: - set HOMEBREW_MACOS_VERSION to 0 on non-HOMEBREW_MACOS machines - set HOMEBREW_CURL to Homebrew'd curl
-rw-r--r--Library/Homebrew/brew.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 47064c61b..505cbeb4c 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -111,10 +111,16 @@ then
else
HOMEBREW_PROCESSOR="$(uname -m)"
HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew"
+ HOMEBREW_MACOS_VERSION=0
[[ -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"
+ if [[ -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
+ then
+ HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
+ fi
+
if [[ -z "$HOMEBREW_CACHE" ]]
then
if [[ -n "$XDG_CACHE_HOME" ]]