mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

update all_proxy and man pages #3751

Browse Source
This commit is contained in:
xiehuc 2018-02-01 18:11:29 +08:00
parent a214387358
commit 3e6adb7e33
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,6 +247,10 @@ can take several different forms:
Sets the HTTPS proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
* `all_proxy`:
Sets the SOCKS5 proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
* `ftp_proxy`:
Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
@ -256,12 +260,14 @@ can take several different forms:
by `curl`, `git` and `svn` when downloading through Homebrew.
## USING HOMEBREW BEHIND A PROXY
Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
Use the `http_proxy`, `https_proxy`, `all_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
For example for an unauthenticated HTTP proxy:
For example for an unauthenticated HTTP or SOCKS5 proxy:
export http_proxy=http://<host>:<port>
export all_proxy=socks5://<host>:<port>
And for an authenticated HTTP proxy:
export http_proxy=http://<user>:<password>@<host>:<port>

2
bin/brew
View File

@ -67,7 +67,7 @@ then
FILTERED_ENV=()
# Filter all but the specific variables.
for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SSH_AUTH_SOCK SUDO_ASKPASS \
http_proxy https_proxy ftp_proxy no_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY \
http_proxy https_proxy ftp_proxy no_proxy all_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY \
"${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}"
do
# Skip if variable value is empty.

10
docs/Manpage.md
View File

@ -1062,6 +1062,10 @@ can take several different forms:
Sets the HTTPS proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
* `all_proxy`:
Sets the SOCKS5 proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
* `ftp_proxy`:
Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
@ -1071,12 +1075,14 @@ can take several different forms:
by `curl`, `git` and `svn` when downloading through Homebrew.
## USING HOMEBREW BEHIND A PROXY
Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
Use the `http_proxy`, `https_proxy`, `all_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
For example for an unauthenticated HTTP proxy:
For example for an unauthenticated HTTP or SOCKS5 proxy:
export http_proxy=http://`host`:`port`
export all_proxy=socks5://`host`:`port`
And for an authenticated HTTP proxy:
export http_proxy=http://`user`:`password`@`host`:`port`

2
manpages/brew-cask.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW\-CASK" "1" "January 2018" "Homebrew" "brew-cask"
.TH "BREW\-CASK" "1" "February 2018" "Homebrew" "brew-cask"
.
.SH "NAME"
\fBbrew\-cask\fR \- a friendly binary installer for macOS

12
manpages/brew.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW" "1" "January 2018" "Homebrew" "brew"
.TH "BREW" "1" "February 2018" "Homebrew" "brew"
.
.SH "NAME"
\fBbrew\fR \- The missing package manager for macOS
@ -1088,6 +1088,10 @@ Sets the HTTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downl
Sets the HTTPS proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
.
.TP
\fBall_proxy\fR
Sets the SOCKS5 proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
.
.TP
\fBftp_proxy\fR
Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
.
@ -1096,16 +1100,18 @@ Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downlo
Sets the comma\-separated list of hostnames and domain names that should be excluded from proxying by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
.
.SH "USING HOMEBREW BEHIND A PROXY"
Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\.
Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBall_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\.
.
.P
For example for an unauthenticated HTTP proxy:
For example for an unauthenticated HTTP or SOCKS5 proxy:
.
.IP "" 4
.
.nf
export http_proxy=http://<host>:<port>
export all_proxy=socks5://<host>:<port>
.
.fi
.