From 924865ec7f18078650be87ca31b6c0a434b0a78d Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Thu, 11 Jan 2018 16:33:20 +0000
Subject: curl: handle more non-executable curl edge-cases.

Address some additional issues mentioned in #3624.
---
 Library/Homebrew/utils/curl.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index cf1735576..65edd85df 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -2,10 +2,13 @@ require "pathname"
 require "open3"
 
 def curl_executable
-  curl = Pathname.new ENV["HOMEBREW_CURL"]
-  curl = which("curl") unless curl.exist?
-  return curl if curl.executable?
-  raise "#{curl} is not executable"
+  @curl ||= [
+    ENV["HOMEBREW_CURL"],
+    which("curl"),
+    "/usr/bin/curl",
+  ].map { |c| Pathname(c) }.find(&:executable?)
+  raise "curl is not executable" unless @curl
+  @curl
 end
 
 def curl_args(*extra_args, show_output: false, user_agent: :default)
-- 
cgit v1.2.3