From e7a9f6eb89b55e275e0a260cf182b551df627180 Mon Sep 17 00:00:00 2001 From: Stephen Nelson Date: Mon, 8 Oct 2012 14:00:20 +1300 Subject: [PATCH] Homebrew should not ignore curlrc Added doctor check for .curlrc rather than silently ignoring it (#13836). Closes Homebrew/homebrew#15419. Signed-off-by: Max Howell Removed test in doctor where it actually curl'd a file. It's enough to warn if the curlrc exists. I understand people want to remove the warnings, but the point in the doctor is to help diagnose and not to be some ramification of your UNIX system. --- Library/Homebrew/cmd/doctor.rb | 11 +++++++++++ Library/Homebrew/global.rb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index ca837539f5..9be391cfda 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -485,6 +485,17 @@ def check_user_path_3 end end +def check_user_curlrc + if %w[CURL_HOME HOME].one?{|key| ENV[key] and File.exists? "#{ENV[key]}/.curlrc" } then <<-EOS.undent + You have a curlrc file + If you have trouble downloading packages with Homebrew, then maybe this + is the problem? If the following command doesn't work, then try removing + your curlrc: + curl http://github.com + EOS + end +end + def check_which_pkg_config binary = which 'pkg-config' return if binary.nil? diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 81065f8baf..d7071eafbc 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -74,7 +74,7 @@ end HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; #{OS_VERSION})" -HOMEBREW_CURL_ARGS = '-qf#LA' +HOMEBREW_CURL_ARGS = '-f#LA' module Homebrew extend self include FileUtils