admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Curl: Allow option to omit --retry in curl_args

Browse Source
This commit is contained in:
Sam Ford 2020-12-19 17:56:25 -05:00
parent 9d92ed868b
commit e687774e8a
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/utils/curl.rb
View File

@ -21,7 +21,7 @@ module Utils
@curl @curl
end end
def curl_args(*extra_args, show_output: false, user_agent: :default) def curl_args(*extra_args, **options)
args = [] args = []
# do not load .curlrc unless requested (must be the first argument) # do not load .curlrc unless requested (must be the first argument)
@ -31,25 +31,25 @@ module Utils
args << "--show-error" args << "--show-error"
args << "--user-agent" << case user_agent args << "--user-agent" << case options[:user_agent]
when :browser, :fake when :browser, :fake
HOMEBREW_USER_AGENT_FAKE_SAFARI HOMEBREW_USER_AGENT_FAKE_SAFARI
when :default when :default, nil
HOMEBREW_USER_AGENT_CURL HOMEBREW_USER_AGENT_CURL
else when String
user_agent options[:user_agent]
end end
args << "--header" << "Accept-Language: en" args << "--header" << "Accept-Language: en"
unless show_output unless options[:show_output] == true
args << "--fail" args << "--fail"
args << "--progress-bar" unless Context.current.verbose? args << "--progress-bar" unless Context.current.verbose?
args << "--verbose" if Homebrew::EnvConfig.curl_verbose? args << "--verbose" if Homebrew::EnvConfig.curl_verbose?
args << "--silent" unless $stdout.tty? args << "--silent" unless $stdout.tty?
end end
args << "--retry" << Homebrew::EnvConfig.curl_retries args << "--retry" << Homebrew::EnvConfig.curl_retries unless options[:retry] == false
args + extra_args args + extra_args
end end