Merge remote-tracking branch 'origin/master' into insecure_audit

4 files changed, 27 insertions, 12 deletions

diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index cc7ad54d2..7dd54d3f1 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -35,7 +35,7 @@ module Utils
         end
 
         # Send analytics. Don't send or store any personally identifiable information.
-        # https://github.com/Homebrew/brew/blob/master/docs/Analytics.md
+        # http://docs.brew.sh/Analytics.html
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide
         # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
         if ENV["HOMEBREW_ANALYTICS_DEBUG"]
diff --git a/Library/Homebrew/utils/analytics.sh b/Library/Homebrew/utils/analytics.sh
index 0f188fe9b..35f91eabc 100644
--- a/Library/Homebrew/utils/analytics.sh
+++ b/Library/Homebrew/utils/analytics.sh
@@ -107,7 +107,7 @@ report-analytics-screenview-command() {
   )
 
   # Send analytics. Don't send or store any personally identifiable information.
-  # https://github.com/Homebrew/brew/blob/master/docs/Analytics.md
+  # http://docs.brew.sh/Analytics.html
   # https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide#screenView
   # https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters
   if [[ -z "$HOMEBREW_ANALYTICS_DEBUG" ]]
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index 00c3a591c..5a40ae846 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -1,27 +1,41 @@
 require "pathname"
 require "open3"
 
-def curl_args(extra_args = [])
+def curl_args(options = {})
   curl = Pathname.new ENV["HOMEBREW_CURL"]
   curl = Pathname.new "/usr/bin/curl" unless curl.exist?
   raise "#{curl} is not executable" unless curl.exist? && curl.executable?
 
-  flags = HOMEBREW_CURL_ARGS
-  flags -= ["--progress-bar"] if ARGV.verbose?
+  args = [
+    curl.to_s,
+    "--remote-time",
+    "--location",
+  ]
 
-  args = [curl.to_s] + flags + extra_args
-  args << "--verbose" if ENV["HOMEBREW_CURL_VERBOSE"]
-  args << "--silent" if !$stdout.tty? || ENV["TRAVIS"]
+  case options[:user_agent]
+  when :browser
+    args << "--user-agent" << HOMEBREW_USER_AGENT_FAKE_SAFARI
+  else
+    args << "--user-agent" << HOMEBREW_USER_AGENT_CURL
+  end
+
+  unless options[:show_output]
+    args << "--progress-bar" unless ARGV.verbose?
+    args << "--verbose" if ENV["HOMEBREW_CURL_VERBOSE"]
+    args << "--fail"
+    args << "--silent" if !$stdout.tty? || ENV["TRAVIS"]
+  end
+
+  args += options[:extra_args] if options[:extra_args]
   args
 end
 
 def curl(*args)
-  safe_system(*curl_args(args))
+  safe_system(*curl_args(extra_args: args))
 end
 
 def curl_output(*args)
-  curl_args = curl_args(args)
-  curl_args -= ["--fail", "--silent"]
+  curl_args = curl_args(extra_args: args, show_output: true)
   Open3.popen3(*curl_args) do |_, stdout, stderr, wait_thread|
     [stdout.read, stderr.read, wait_thread.value]
   end
diff --git a/Library/Homebrew/utils/inreplace.rb b/Library/Homebrew/utils/inreplace.rb
index c7557ab41..b4c219f06 100644
--- a/Library/Homebrew/utils/inreplace.rb
+++ b/Library/Homebrew/utils/inreplace.rb
@@ -1,9 +1,10 @@
 module Utils
   class InreplaceError < RuntimeError
     def initialize(errors)
-      super errors.inject("inreplace failed\n") do |s, (path, errs)|
+      formatted_errors = errors.inject("inreplace failed\n") do |s, (path, errs)|
         s << "#{path}:\n" << errs.map { |e| "  #{e}\n" }.join
       end
+      super formatted_errors
     end
   end