Merge pull request #4900 from lembacon/curlrc

Make remaining `curl` respect `HOMEBREW_CURLRC`

Library/Homebrew/cmd/update.sh

@@ -406,6 +406,13 @@ EOS
     QUIET_ARGS=()
   fi
 
+  if [[ -z "$HOMEBREW_CURLRC" ]]
+  then
+    CURL_DISABLE_CURLRC_ARGS=(-q)
+  else
+    CURL_DISABLE_CURLRC_ARGS=()
+  fi
+
   # only allow one instance of brew update
   lock update
 
@@ -481,7 +488,9 @@ EOS
           GITHUB_API_ENDPOINT="commits/$UPSTREAM_BRANCH_DIR"
         fi
 
-        UPSTREAM_SHA_HTTP_CODE="$("$HOMEBREW_CURL" --silent --max-time 3 \
+        UPSTREAM_SHA_HTTP_CODE="$("$HOMEBREW_CURL" \
+           "${CURL_DISABLE_CURLRC_ARGS[@]}" \
+           --silent --max-time 3 \
            --location --output /dev/null --write-out "%{http_code}" \
            --dump-header "$DIR/.git/GITHUB_HEADERS" \
            --user-agent "$HOMEBREW_USER_AGENT_CURL" \

Library/Homebrew/utils/analytics.rb

@@ -24,7 +24,12 @@ module Utils
       def report(type, metadata = {})
         return if ENV["HOMEBREW_NO_ANALYTICS"] || ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"]
 
-        args = %W[
+        args = []
+
+        # do not load .curlrc unless requested (must be the first argument)
+        args << "-q" unless ENV["HOMEBREW_CURLRC"]
+
+        args += %W[
           --max-time 3
           --user-agent #{HOMEBREW_USER_AGENT_CURL}
           --data v=1
@@ -49,14 +54,14 @@ module Utils
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
         if ENV["HOMEBREW_ANALYTICS_DEBUG"]
           url = "https://www.google-analytics.com/debug/collect"
-          puts "#{ENV["HOMEBREW_CURL"]} #{url} #{args.join(" ")}"
+          puts "#{ENV["HOMEBREW_CURL"]} #{args.join(" ")} #{url}"
-          puts Utils.popen_read ENV["HOMEBREW_CURL"], url, *args
+          puts Utils.popen_read ENV["HOMEBREW_CURL"], *args, url
         else
           pid = fork do
             exec ENV["HOMEBREW_CURL"],
-              "https://www.google-analytics.com/collect",
+              *args,
               "--silent", "--output", "/dev/null",
-              *args
+              "https://www.google-analytics.com/collect"
           end
           Process.detach pid
         end