diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb index 4c51c0596b..5581f2f6c8 100644 --- a/Library/Homebrew/manpages/brew.1.md.erb +++ b/Library/Homebrew/manpages/brew.1.md.erb @@ -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. * `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`. * `HOMEBREW_CURL_VERBOSE`: diff --git a/Library/Homebrew/test/utils/curl_spec.rb b/Library/Homebrew/test/utils/curl_spec.rb index e9b48009d8..544e57bc1b 100644 --- a/Library/Homebrew/test/utils/curl_spec.rb +++ b/Library/Homebrew/test/utils/curl_spec.rb @@ -4,14 +4,14 @@ require "utils/curl" describe "curl" do describe "curl_args" do - it "returns -q as the first argument when HOMEBREW_CURLRC is not set" do - # -q must be the first argument according to "man curl" - expect(curl_args("foo").first).to eq("-q") + it "returns --disable as the first argument when HOMEBREW_CURLRC is not set" do + # --disable must be the first argument according to "man curl" + expect(curl_args("foo").first).to eq("--disable") 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" - expect(curl_args("foo").first).not_to eq("-q") + expect(curl_args("foo").first).not_to eq("--disable") end it "uses `--retry 3` when HOMEBREW_CURL_RETRIES is unset" do diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb index c225be5ac9..882f11315e 100644 --- a/Library/Homebrew/utils/analytics.rb +++ b/Library/Homebrew/utils/analytics.rb @@ -12,7 +12,7 @@ module Utils args = [] # 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[ --max-time 3 diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index d78e4bc96c..d8ff9a0984 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -17,7 +17,7 @@ def curl_args(*extra_args, show_output: false, user_agent: :default) args = [] # 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" diff --git a/docs/Manpage.md b/docs/Manpage.md index 230698e4ee..ace12b9b16 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -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. * `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`. * `HOMEBREW_CURL_VERBOSE`: diff --git a/manpages/brew.1 b/manpages/brew.1 index ff46ac5bbb..228d6853db 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1495,7 +1495,7 @@ By default, Homebrew uses \fBhttps://github\.com/Homebrew/homebrew\-core\fR (or . .TP \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 \fBHOMEBREW_CURL_VERBOSE\fR