From 8d4d56c8db79fd73803afd1caa726d52d4f605e4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 18 Feb 2014 16:03:44 -0500 Subject: [PATCH] Use standard curl progress output in verbose mode Closes Homebrew/homebrew#26818. --- Library/Homebrew/utils.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 63eeff3fa8..ee429073bf 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -136,7 +136,10 @@ def curl *args curl = Pathname.new '/usr/bin/curl' raise "#{curl} is not executable" unless curl.exist? and curl.executable? - args = [HOMEBREW_CURL_ARGS, HOMEBREW_USER_AGENT, *args] + flags = HOMEBREW_CURL_ARGS + flags = flags.delete("#") if ARGV.verbose? + + args = [flags, HOMEBREW_USER_AGENT, *args] # See https://github.com/Homebrew/homebrew/issues/6103 args << "--insecure" if MacOS.version < "10.6" args << "--verbose" if ENV['HOMEBREW_CURL_VERBOSE']