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

Use long --disable instead of short -q in curl

Browse Source
This commit is contained in:
Vítor Galvão 2020-03-28 19:38:39 +00:00
parent 6530e333b3
commit 2e8aa3eb97
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/manpages/brew.1.md.erb
View File

@ -160,7 +160,7 @@ Note that environment variables must have a value set to be detected. For exampl
`git`(1) remote. If set, instructs Homebrew to instead use the specified URL. `git`(1) remote. If set, instructs Homebrew to instead use the specified URL.
* `HOMEBREW_CURLRC`: * `HOMEBREW_CURLRC`:
If set, Homebrew will not pass `-q` when invoking `curl`(1), which disables If set, Homebrew will not pass `--disable` when invoking `curl`(1), which disables
the use of `curlrc`. the use of `curlrc`.
* `HOMEBREW_CURL_VERBOSE`: * `HOMEBREW_CURL_VERBOSE`:

10
Library/Homebrew/test/utils/curl_spec.rb
View File

@ -4,14 +4,14 @@ require "utils/curl"
describe "curl" do describe "curl" do
describe "curl_args" do describe "curl_args" do
it "returns -q as the first argument when HOMEBREW_CURLRC is not set" do it "returns --disable as the first argument when HOMEBREW_CURLRC is not set" do
# -q must be the first argument according to "man curl" # --disable must be the first argument according to "man curl"
expect(curl_args("foo").first).to eq("-q") expect(curl_args("foo").first).to eq("--disable")
end end
it "doesn't return -q as the first argument when HOMEBREW_CURLRC is set" do it "doesn't return --disable as the first argument when HOMEBREW_CURLRC is set" do
ENV["HOMEBREW_CURLRC"] = "1" ENV["HOMEBREW_CURLRC"] = "1"
expect(curl_args("foo").first).not_to eq("-q") expect(curl_args("foo").first).not_to eq("--disable")
end end
it "uses `--retry 3` when HOMEBREW_CURL_RETRIES is unset" do it "uses `--retry 3` when HOMEBREW_CURL_RETRIES is unset" do

2
Library/Homebrew/utils/analytics.rb
View File

@ -12,7 +12,7 @@ module Utils
args = [] args = []
# do not load .curlrc unless requested (must be the first argument) # do not load .curlrc unless requested (must be the first argument)
args << "-q" unless ENV["HOMEBREW_CURLRC"] args << "--disable" unless ENV["HOMEBREW_CURLRC"]
args += %W[ args += %W[
--max-time 3 --max-time 3

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

@ -17,7 +17,7 @@ def curl_args(*extra_args, show_output: false, user_agent: :default)
args = [] args = []
# do not load .curlrc unless requested (must be the first argument) # do not load .curlrc unless requested (must be the first argument)
args << "-q" unless ENV["HOMEBREW_CURLRC"] args << "--disable" unless ENV["HOMEBREW_CURLRC"]
args << "--globoff" args << "--globoff"

2
docs/Manpage.md
View File

@ -1199,7 +1199,7 @@ Note that environment variables must have a value set to be detected. For exampl
`git`(1) remote. If set, instructs Homebrew to instead use the specified URL. `git`(1) remote. If set, instructs Homebrew to instead use the specified URL.
* `HOMEBREW_CURLRC`: * `HOMEBREW_CURLRC`:
If set, Homebrew will not pass `-q` when invoking `curl`(1), which disables If set, Homebrew will not pass `--disable` when invoking `curl`(1), which disables
the use of `curlrc`. the use of `curlrc`.
* `HOMEBREW_CURL_VERBOSE`: * `HOMEBREW_CURL_VERBOSE`:

2
manpages/brew.1
View File

@ -1495,7 +1495,7 @@ By default, Homebrew uses \fBhttps://github\.com/Homebrew/homebrew\-core\fR (or
. .
.TP .TP
\fBHOMEBREW_CURLRC\fR \fBHOMEBREW_CURLRC\fR
If set, Homebrew will not pass \fB\-q\fR when invoking \fBcurl\fR(1), which disables the use of \fBcurlrc\fR\. If set, Homebrew will not pass \fB\-\-disable\fR when invoking \fBcurl\fR(1), which disables the use of \fBcurlrc\fR\.
. .
.TP .TP
\fBHOMEBREW_CURL_VERBOSE\fR \fBHOMEBREW_CURL_VERBOSE\fR