From e5f4160d3e7ca58f2d5f9d599246e051a32cbec4 Mon Sep 17 00:00:00 2001
From: Maxim Belkin
Date: Thu, 15 Feb 2018 11:43:20 -0600
Subject: 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 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" ]]
-- 
cgit v1.2.3


From e47c364c55be42462ccaacfc9bebbfd2101525b2 Mon Sep 17 00:00:00 2001
From: Maxim Belkin
Date: Thu, 15 Feb 2018 13:09:47 -0600
Subject: Don't set HOMEBREW_MACOS_VERSION on non-mac systems

---
 Library/Homebrew/brew.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 505cbeb4c..d646ebfd3 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -111,7 +111,6 @@ 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"
-- 
cgit v1.2.3


From 30d468978fb0d299f3faa4461c15e82102e0d3a5 Mon Sep 17 00:00:00 2001
From: Maxim Belkin
Date: Thu, 15 Feb 2018 13:26:17 -0600
Subject: Unifying Linux/Mac logic that sets HOMEBREW_CURL

---
 Library/Homebrew/brew.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index d646ebfd3..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,11 +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"
-
-  if [[ -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
-  then
-    HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
-  fi
+  HOMEBREW_FORCE_BREWED_CURL=1
 
   if [[ -z "$HOMEBREW_CACHE" ]]
   then
@@ -130,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"
-- 
cgit v1.2.3