aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-02-18 16:03:44 -0500
committerJack Nagel2014-02-18 16:03:52 -0500
commit2c2aa4578eae671faf84f2315e32e1d93d90705d (patch)
treef674384f6675af3898e43fdaf724ab750d8423e9 /Library
parent95bdff9fa93217ce90a6bcb1e12112429ead45a7 (diff)
downloadhomebrew-2c2aa4578eae671faf84f2315e32e1d93d90705d.tar.bz2
Use standard curl progress output in verbose mode
Closes #26818.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/utils.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 63eeff3fa..ee429073b 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']