From e5f4160d3e7ca58f2d5f9d599246e051a32cbec4 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Thu, 15 Feb 2018 11:43:20 -0600 Subject: [PATCH] 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 --- Library/Homebrew/brew.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 47064c61b9..505cbeb4ca 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" ]]