Use HOMEBREW_CURL universally, including formulae

Author: Bo98

Library/Homebrew/brew.rb

@@ -77,9 +77,9 @@ class MissingEnvironmentVariables < RuntimeError; end
   path = PATH.new(ENV["PATH"])
   homebrew_path = PATH.new(ENV["HOMEBREW_PATH"])
 
-  # Add SCM wrappers.
-  path.prepend(HOMEBREW_SHIMS_PATH/"scm")
-  homebrew_path.prepend(HOMEBREW_SHIMS_PATH/"scm")
+  # Add shared wrappers.
+  path.prepend(HOMEBREW_SHIMS_PATH/"shared")
+  homebrew_path.prepend(HOMEBREW_SHIMS_PATH/"shared")
 
   ENV["PATH"] = path
 

Library/Homebrew/brew.sh

@@ -165,8 +165,12 @@ brew() {
   "${HOMEBREW_BREW_FILE}" "$@"
 }
 
+curl() {
+  "${HOMEBREW_LIBRARY}/Homebrew/shims/shared/curl" "$@"
+}
+
 git() {
-  "${HOMEBREW_LIBRARY}/Homebrew/shims/scm/git" "$@"
+  "${HOMEBREW_LIBRARY}/Homebrew/shims/shared/git" "$@"
 }
 
 # Search given executable in PATH (remove dependency for `which` command)
@@ -554,7 +558,7 @@ else
 fi
 
 HOMEBREW_USER_AGENT="${HOMEBREW_PRODUCT}/${HOMEBREW_USER_AGENT_VERSION} (${HOMEBREW_SYSTEM}; ${HOMEBREW_PROCESSOR} ${HOMEBREW_OS_USER_AGENT_VERSION})"
-curl_version_output="$("${HOMEBREW_CURL}" --version 2>/dev/null)"
+curl_version_output="$(curl --version 2>/dev/null)"
 curl_name_and_version="${curl_version_output%% (*}"
 HOMEBREW_USER_AGENT_CURL="${HOMEBREW_USER_AGENT} ${curl_name_and_version// //}"
 

Library/Homebrew/cmd/update.sh

@@ -18,12 +18,20 @@
 # shellcheck disable=SC2154
 source "${HOMEBREW_LIBRARY}/Homebrew/utils/lock.sh"
 
-# Replaces the function in Library/Homebrew/brew.sh to cache the Git executable to
-# provide speedup when using Git repeatedly (as update.sh does).
+# Replaces the function in Library/Homebrew/brew.sh to cache the Curl/Git executable to
+# provide speedup when using Curl/Git repeatedly (as update.sh does).
+curl() {
+  if [[ -z "${CURL_EXECUTABLE}" ]]
+  then
+    CURL_EXECUTABLE="$("${HOMEBREW_LIBRARY}/Homebrew/shims/shared/curl" --homebrew=print-path)"
+  fi
+  "${CURL_EXECUTABLE}" "$@"
+}
+
 git() {
   if [[ -z "${GIT_EXECUTABLE}" ]]
   then
-    GIT_EXECUTABLE="$("${HOMEBREW_LIBRARY}/Homebrew/shims/scm/git" --homebrew=print-path)"
+    GIT_EXECUTABLE="$("${HOMEBREW_LIBRARY}/Homebrew/shims/shared/git" --homebrew=print-path)"
   fi
   "${GIT_EXECUTABLE}" "$@"
 }
@@ -564,7 +572,7 @@ EOS
         # HOMEBREW_CURL is set by brew.sh (and isn't mispelt here)
         # shellcheck disable=SC2153
         UPSTREAM_SHA_HTTP_CODE="$(
-          "${HOMEBREW_CURL}" \
+          curl \
             "${CURL_DISABLE_CURLRC_ARGS[@]}" \
             --silent --max-time 3 \
             --location --no-remote-time --output /dev/null --write-out "%{http_code}" \

Library/Homebrew/extend/ENV/std.rb

@@ -28,7 +28,8 @@ def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_a
 
     self["HOMEBREW_ENV"] = "std"
 
-    PATH.new(ENV["HOMEBREW_PATH"]).each { |p| prepend_path "PATH", p }
+    PATH.new(ENV["HOMEBREW_PATH"]).reverse_each { |p| prepend_path "PATH", p }
+    prepend_path "PATH", HOMEBREW_SHIMS_PATH/"shared"
 
     # Set the default pkg-config search path, overriding the built-in paths
     # Anything in PKG_CONFIG_PATH is searched before paths in this variable

Library/Homebrew/shims/linux/super/git

@@ -1 +1 @@
-../../scm/git
+../../shared/git

Library/Homebrew/shims/linux/super/svn

@@ -1 +1 @@
-../../scm/svn
+../../shared/svn

Library/Homebrew/shims/mac/super/git

@@ -1 +1 @@
-../../scm/git
+../../shared/git

Library/Homebrew/shims/mac/super/svn

@@ -1 +1 @@
-../../scm/svn
+../../shared/svn

Library/Homebrew/shims/shared/curl

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Make our $HOMEBREW_CURL selection universal - including in formulae usage.
+
+# HOMEBREW_LIBRARY is set by bin/brew
+# HOMEBREW_CURL is set by brew.sh
+# shellcheck disable=SC2154
+if [[ -z "${HOMEBREW_LIBRARY}" ]]
+then
+  echo "${0##*/}: This shim is internal and must be run via brew." >&2
+  exit 1
+fi
+
+source "${HOMEBREW_LIBRARY}/Homebrew/shims/utils.sh"
+
+try_exec_non_system "${HOMEBREW_CURL:-curl}" "$@"
+safe_exec "/usr/bin/curl" "$@"
+
+echo "Could not execute curl. Try HOMEBREW_FORCE_BREWED_CURL=1" >&2
+exit 1