From 679cbd04934c5ff46b0545eb17e47110ee149661 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Fri, 10 Sep 2021 18:59:42 +0000 Subject: [PATCH] Update maintainers, manpage and completions. Autogenerated by the [update-man-completions](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/update-man-completions.yml) workflow. --- completions/bash/brew | 1 + completions/fish/brew.fish | 9 +++++---- completions/zsh/_brew | 17 +++++++++-------- docs/Manpage.md | 10 ++++++---- manpages/brew.1 | 12 ++++++++---- 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/completions/bash/brew b/completions/bash/brew index a787939843..3f96366118 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -125,6 +125,7 @@ _brew___cache() { -*) __brewcomp " --HEAD + --bottle-tag --build-from-source --cask --debug diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 9cb80989d4..2f4d4b8fcf 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -201,6 +201,7 @@ end __fish_brew_complete_cmd '--cache' 'Display Homebrew\'s download cache' __fish_brew_complete_arg '--cache' -l HEAD -d 'Show the cache file used when building from HEAD' +__fish_brew_complete_arg '--cache' -l bottle-tag -d 'Show the cache file used when pouring a bottle for the given tag' __fish_brew_complete_arg '--cache' -l build-from-source -d 'Show the cache file used when building from source' __fish_brew_complete_arg '--cache' -l cask -d 'Only show cache files for casks' __fish_brew_complete_arg '--cache' -l debug -d 'Display any debugging information' @@ -758,7 +759,7 @@ __fish_brew_complete_arg 'instal' -l cc -d 'Attempt to compile using the specifi __fish_brew_complete_arg 'instal' -l colorpickerdir -d 'Target location for Color Pickers (default: `~/Library/ColorPickers`)' __fish_brew_complete_arg 'instal' -l debug -d 'If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory' __fish_brew_complete_arg 'instal' -l dictionarydir -d 'Target location for Dictionaries (default: `~/Library/Dictionaries`)' -__fish_brew_complete_arg 'instal' -l display-times -d 'Print install times for each formula at the end of the run' +__fish_brew_complete_arg 'instal' -l display-times -d 'Print install times for each package at the end of the run' __fish_brew_complete_arg 'instal' -l env -d 'Disabled other than for internal Homebrew use' __fish_brew_complete_arg 'instal' -l fetch-HEAD -d 'Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository\'s HEAD will only be checked for updates when a new stable or development version has been released' __fish_brew_complete_arg 'instal' -l fontdir -d 'Target location for Fonts (default: `~/Library/Fonts`)' @@ -806,7 +807,7 @@ __fish_brew_complete_arg 'install' -l cc -d 'Attempt to compile using the specif __fish_brew_complete_arg 'install' -l colorpickerdir -d 'Target location for Color Pickers (default: `~/Library/ColorPickers`)' __fish_brew_complete_arg 'install' -l debug -d 'If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory' __fish_brew_complete_arg 'install' -l dictionarydir -d 'Target location for Dictionaries (default: `~/Library/Dictionaries`)' -__fish_brew_complete_arg 'install' -l display-times -d 'Print install times for each formula at the end of the run' +__fish_brew_complete_arg 'install' -l display-times -d 'Print install times for each package at the end of the run' __fish_brew_complete_arg 'install' -l env -d 'Disabled other than for internal Homebrew use' __fish_brew_complete_arg 'install' -l fetch-HEAD -d 'Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository\'s HEAD will only be checked for updates when a new stable or development version has been released' __fish_brew_complete_arg 'install' -l fontdir -d 'Target location for Fonts (default: `~/Library/Fonts`)' @@ -1070,7 +1071,7 @@ __fish_brew_complete_arg 'pr-automerge' -l tap -d 'Target tap repository (defaul __fish_brew_complete_arg 'pr-automerge' -l verbose -d 'Make some output more verbose' __fish_brew_complete_arg 'pr-automerge' -l with-label -d 'Pull requests must have this label' __fish_brew_complete_arg 'pr-automerge' -l without-approval -d 'Pull requests do not require approval to be merged' -__fish_brew_complete_arg 'pr-automerge' -l without-labels -d 'Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux-only`, `linux to homebrew-core`)' +__fish_brew_complete_arg 'pr-automerge' -l without-labels -d 'Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux to homebrew-core`)' __fish_brew_complete_cmd 'pr-publish' 'Publish bottles for a pull request with GitHub Actions' @@ -1526,7 +1527,7 @@ __fish_brew_complete_arg 'upgrade' -l cask -d 'Treat all named arguments as cask __fish_brew_complete_arg 'upgrade' -l colorpickerdir -d 'Target location for Color Pickers (default: `~/Library/ColorPickers`)' __fish_brew_complete_arg 'upgrade' -l debug -d 'If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory' __fish_brew_complete_arg 'upgrade' -l dictionarydir -d 'Target location for Dictionaries (default: `~/Library/Dictionaries`)' -__fish_brew_complete_arg 'upgrade' -l display-times -d 'Print install times for each formula at the end of the run' +__fish_brew_complete_arg 'upgrade' -l display-times -d 'Print install times for each package at the end of the run' __fish_brew_complete_arg 'upgrade' -l dry-run -d 'Show what would be upgraded, but do not actually upgrade anything' __fish_brew_complete_arg 'upgrade' -l fetch-HEAD -d 'Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository\'s HEAD will only be checked for updates when a new stable or development version has been released' __fish_brew_complete_arg 'upgrade' -l fontdir -d 'Target location for Fonts (default: `~/Library/Fonts`)' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index ee926c5fad..9c0df6cd99 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -252,10 +252,11 @@ __brew_diagnostic_checks() { # brew --cache _brew___cache() { _arguments \ - '(--build-from-source --force-bottle --cask)--HEAD[Show the cache file used when building from HEAD]' \ - '(--force-bottle --HEAD --cask)--build-from-source[Show the cache file used when building from source]' \ + '(--build-from-source --force-bottle --bottle-tag --cask)--HEAD[Show the cache file used when building from HEAD]' \ + '(--build-from-source --force-bottle --HEAD --cask)--bottle-tag[Show the cache file used when pouring a bottle for the given tag]' \ + '(--force-bottle --bottle-tag --HEAD --cask)--build-from-source[Show the cache file used when building from source]' \ '--debug[Display any debugging information]' \ - '(--build-from-source --HEAD --cask)--force-bottle[Show the cache file used when pouring a bottle]' \ + '(--build-from-source --bottle-tag --HEAD --cask)--force-bottle[Show the cache file used when pouring a bottle]' \ '--help[Show this message]' \ '--quiet[Make some output more quiet]' \ '--verbose[Make some output more verbose]' \ @@ -263,7 +264,7 @@ _brew___cache() { '(--cask)--formula[Only show cache files for formulae]' \ '*::formula:__brew_formulae' \ - cask \ - '(--build-from-source --force-bottle --HEAD --formula)--cask[Only show cache files for casks]' \ + '(--build-from-source --force-bottle --bottle-tag --HEAD --formula)--cask[Only show cache files for casks]' \ '*::cask:__brew_casks' } @@ -937,7 +938,7 @@ _brew_instal() { '(--formula)--colorpickerdir[Target location for Color Pickers (default: `~/Library/ColorPickers`)]' \ '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each formula at the end of the run]' \ + '(--cask)--display-times[Print install times for each package at the end of the run]' \ '(--cask)--env[Disabled other than for internal Homebrew use]' \ '(--cask)--fetch-HEAD[Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository'\''s HEAD will only be checked for updates when a new stable or development version has been released]' \ '(--formula)--fontdir[Target location for Fonts (default: `~/Library/Fonts`)]' \ @@ -989,7 +990,7 @@ _brew_install() { '(--formula)--colorpickerdir[Target location for Color Pickers (default: `~/Library/ColorPickers`)]' \ '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each formula at the end of the run]' \ + '(--cask)--display-times[Print install times for each package at the end of the run]' \ '(--cask)--env[Disabled other than for internal Homebrew use]' \ '(--cask)--fetch-HEAD[Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository'\''s HEAD will only be checked for updates when a new stable or development version has been released]' \ '(--formula)--fontdir[Target location for Fonts (default: `~/Library/Fonts`)]' \ @@ -1313,7 +1314,7 @@ _brew_pr_automerge() { '--verbose[Make some output more verbose]' \ '--with-label[Pull requests must have this label]' \ '--without-approval[Pull requests do not require approval to be merged]' \ - '--without-labels[Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux-only`, `linux to homebrew-core`)]' + '--without-labels[Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux to homebrew-core`)]' } # brew pr-publish @@ -1871,7 +1872,7 @@ _brew_upgrade() { '(--formula)--colorpickerdir[Target location for Color Pickers (default: `~/Library/ColorPickers`)]' \ '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each formula at the end of the run]' \ + '(--cask)--display-times[Print install times for each package at the end of the run]' \ '--dry-run[Show what would be upgraded, but do not actually upgrade anything]' \ '(--cask)--fetch-HEAD[Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository'\''s HEAD will only be checked for updates when a new stable or development version has been released]' \ '(--formula)--fontdir[Target location for Fonts (default: `~/Library/Fonts`)]' \ diff --git a/docs/Manpage.md b/docs/Manpage.md index bb058d8a68..b3a118223e 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -333,7 +333,7 @@ the installed formulae or, every 30 days, for all formulae. * `--bottle-arch`: Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on. * `--display-times`: - Print install times for each formula at the end of the run. + Print install times for each package at the end of the run. * `-i`, `--interactive`: Download and patch *`formula`*, then open a shell. This allows the user to run `./configure --help` and otherwise determine how to turn the software package into a Homebrew package. * `-g`, `--git`: @@ -697,7 +697,7 @@ upgraded formulae or, every 30 days, for all formulae. * `--keep-tmp`: Retain the temporary files created during installation. * `--display-times`: - Print install times for each formula at the end of the run. + Print install times for each package at the end of the run. * `--cask`: Treat all named arguments as casks. If no named arguments are specified, upgrade only outdated casks. * `--[no-]binaries`: @@ -749,6 +749,8 @@ If *`formula`* is provided, display the file or directory used to cache *`formul Show the cache file used when building from source. * `--force-bottle`: Show the cache file used when pouring a bottle. +* `--bottle-tag`: + Show the cache file used when pouring a bottle for the given tag. * `--HEAD`: Show the cache file used when building from HEAD. * `--formula`: @@ -1194,7 +1196,7 @@ Find pull requests that can be automatically merged using `brew pr-publish`. * `--with-label`: Pull requests must have this label. * `--without-labels`: - Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux-only`, `linux to homebrew-core`). + Pull requests must not have these labels (default: `do not merge`, `new formula`, `automerge-skip`, `linux to homebrew-core`). * `--without-approval`: Pull requests do not require approval to be merged. * `--publish`: @@ -1884,7 +1886,7 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just - `HOMEBREW_BAT_CONFIG_PATH`
Use this as the `bat` configuration file. - *Default:* `$HOME/.bat/config`. + *Default:* `$HOME/.config/bat/config`. - `HOMEBREW_BOOTSNAP`
If set, use Bootsnap to speed up repeated `brew` calls. A no-op when using Homebrew's vendored, relocatable Ruby on macOS (as it doesn't work). diff --git a/manpages/brew.1 b/manpages/brew.1 index b5c10b48ec..83f0533b60 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -449,7 +449,7 @@ Optimise bottles for the specified architecture rather than the oldest architect . .TP \fB\-\-display\-times\fR -Print install times for each formula at the end of the run\. +Print install times for each package at the end of the run\. . .TP \fB\-i\fR, \fB\-\-interactive\fR @@ -957,7 +957,7 @@ Retain the temporary files created during installation\. . .TP \fB\-\-display\-times\fR -Print install times for each formula at the end of the run\. +Print install times for each package at the end of the run\. . .TP \fB\-\-cask\fR @@ -1041,6 +1041,10 @@ Show the cache file used when building from source\. Show the cache file used when pouring a bottle\. . .TP +\fB\-\-bottle\-tag\fR +Show the cache file used when pouring a bottle for the given tag\. +. +.TP \fB\-\-HEAD\fR Show the cache file used when building from HEAD\. . @@ -1682,7 +1686,7 @@ Pull requests must have this label\. . .TP \fB\-\-without\-labels\fR -Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR, \fBautomerge\-skip\fR, \fBlinux\-only\fR, \fBlinux to homebrew\-core\fR)\. +Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR, \fBautomerge\-skip\fR, \fBlinux to homebrew\-core\fR)\. . .TP \fB\-\-without\-approval\fR @@ -2656,7 +2660,7 @@ If set, use \fBbat\fR for the \fBbrew cat\fR command\. Use this as the \fBbat\fR configuration file\. . .IP -\fIDefault:\fR \fB$HOME/\.bat/config\fR\. +\fIDefault:\fR \fB$HOME/\.config/bat/config\fR\. . .TP \fBHOMEBREW_BOOTSNAP\fR