diff options
| author | Ryan Hendrickson | 2015-06-02 21:41:25 -0400 |
|---|---|---|
| committer | Mike McQuaid | 2015-06-04 11:46:25 +0100 |
| commit | aa49da260082deb6d3ec3492d6c836e6ad709ba7 (patch) | |
| tree | cae2135e457b41311754f1c08d7926a761453501 /Library/Homebrew/utils.rb | |
| parent | 9516444dfd0092812b6e7a3d592946ddb042e4eb (diff) | |
| download | brew-aa49da260082deb6d3ec3492d6c836e6ad709ba7.tar.bz2 | |
utils: prefer keg curl over system on 10.6
Closes Homebrew/homebrew#39927.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/utils.rb')
| -rw-r--r-- | Library/Homebrew/utils.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index beb9e05cb..8a8fa46b8 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -175,7 +175,12 @@ def quiet_system cmd, *args end def curl *args - curl = Pathname.new '/usr/bin/curl' + brewed_curl = HOMEBREW_PREFIX/"opt/curl/bin/curl" + curl = if MacOS.version <= "10.6" && brewed_curl.exist? + brewed_curl + else + Pathname.new '/usr/bin/curl' + end raise "#{curl} is not executable" unless curl.exist? and curl.executable? flags = HOMEBREW_CURL_ARGS |