diff options
| author | Stephen Nelson | 2012-10-08 14:00:20 +1300 |
|---|---|---|
| committer | Max Howell | 2012-10-28 10:52:07 -0400 |
| commit | ef2597847bf1995c4711f929107e71b8cc418b89 (patch) | |
| tree | e84d93cc5c35a8ece2aa586a4d0657dde37df9ea /Library/Homebrew | |
| parent | 0c9388938f8223cd40680252930eb30845b49a6a (diff) | |
| download | homebrew-ef2597847bf1995c4711f929107e71b8cc418b89.tar.bz2 | |
Homebrew should not ignore curlrc
Added doctor check for .curlrc rather than silently ignoring it (#13836).
Closes #15419.
Signed-off-by: Max Howell <mxcl@me.com>
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.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 11 | ||||
| -rw-r--r-- | Library/Homebrew/global.rb | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index ca837539f..9be391cfd 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 81065f8ba..d7071eafb 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 |