diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 611aba3ccb..52c3fc97e2 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1279,7 +1279,7 @@ __fish_brew_complete_arg 'reinstall' -l colorpickerdir -d 'Target location for C __fish_brew_complete_arg 'reinstall' -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 'reinstall' -l debug-symbols -d 'Generate debug symbols on build. Source will be retained in a cache directory' __fish_brew_complete_arg 'reinstall' -l dictionarydir -d 'Target location for Dictionaries (default: `~/Library/Dictionaries`)' -__fish_brew_complete_arg 'reinstall' -l display-times -d 'Print install times for each formula at the end of the run' +__fish_brew_complete_arg 'reinstall' -l display-times -d 'Print install times for each package at the end of the run' __fish_brew_complete_arg 'reinstall' -l fontdir -d 'Target location for Fonts (default: `~/Library/Fonts`)' __fish_brew_complete_arg 'reinstall' -l force -d 'Install without checking for previously installed keg-only or non-migrated versions' __fish_brew_complete_arg 'reinstall' -l force-bottle -d 'Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index eddafbbeef..f1d3e95448 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -1042,7 +1042,7 @@ _brew_instal() { '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--cask)--debug-symbols[Generate debug symbols on build. Source will be retained in a cache directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each package at the end of the run]' \ + '--display-times[Print install times for each package at the end of the run]' \ '--dry-run[Show what would be installed, but do not actually install 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`)]' \ @@ -1080,7 +1080,7 @@ _brew_instal() { '(--casks --binaries --require-sha --quarantine --adopt --skip-cask-deps --zap --appdir --keyboard-layoutdir --colorpickerdir --prefpanedir --qlplugindir --mdimporterdir --dictionarydir --fontdir --servicedir --input-methoddir --internet-plugindir --audio-unit-plugindir --vst-plugindir --vst3-plugindir --screen-saverdir --language)--formula[Treat all named arguments as formulae]' \ '*::formula:__brew_formulae' \ - cask \ - '(--formulae --env --ignore-dependencies --only-dependencies --cc --build-from-source --force-bottle --include-test --HEAD --fetch-HEAD --keep-tmp --debug-symbols --build-bottle --skip-post-install --bottle-arch --display-times --interactive --git --overwrite)--cask[Treat all named arguments as casks]' \ + '(--formulae --env --ignore-dependencies --only-dependencies --cc --build-from-source --force-bottle --include-test --HEAD --fetch-HEAD --keep-tmp --debug-symbols --build-bottle --skip-post-install --bottle-arch --interactive --git --overwrite)--cask[Treat all named arguments as casks]' \ '*::cask:__brew_casks' } @@ -1100,7 +1100,7 @@ _brew_install() { '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--cask)--debug-symbols[Generate debug symbols on build. Source will be retained in a cache directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each package at the end of the run]' \ + '--display-times[Print install times for each package at the end of the run]' \ '--dry-run[Show what would be installed, but do not actually install 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`)]' \ @@ -1138,7 +1138,7 @@ _brew_install() { '(--casks --binaries --require-sha --quarantine --adopt --skip-cask-deps --zap --appdir --keyboard-layoutdir --colorpickerdir --prefpanedir --qlplugindir --mdimporterdir --dictionarydir --fontdir --servicedir --input-methoddir --internet-plugindir --audio-unit-plugindir --vst-plugindir --vst3-plugindir --screen-saverdir --language)--formula[Treat all named arguments as formulae]' \ '*::formula:__brew_formulae' \ - cask \ - '(--formulae --env --ignore-dependencies --only-dependencies --cc --build-from-source --force-bottle --include-test --HEAD --fetch-HEAD --keep-tmp --debug-symbols --build-bottle --skip-post-install --bottle-arch --display-times --interactive --git --overwrite)--cask[Treat all named arguments as casks]' \ + '(--formulae --env --ignore-dependencies --only-dependencies --cc --build-from-source --force-bottle --include-test --HEAD --fetch-HEAD --keep-tmp --debug-symbols --build-bottle --skip-post-install --bottle-arch --interactive --git --overwrite)--cask[Treat all named arguments as casks]' \ '*::cask:__brew_casks' } @@ -1583,7 +1583,7 @@ _brew_reinstall() { '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--cask)--debug-symbols[Generate debug symbols on build. Source will be retained in a cache 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]' \ + '--display-times[Print install times for each package at the end of the run]' \ '(--formula)--fontdir[Target location for Fonts (default: `~/Library/Fonts`)]' \ '--force[Install without checking for previously installed keg-only or non-migrated versions]' \ '(--cask --build-from-source)--force-bottle[Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation]' \ @@ -1614,7 +1614,7 @@ _brew_reinstall() { '(--casks --binaries --require-sha --quarantine --adopt --skip-cask-deps --zap --appdir --keyboard-layoutdir --colorpickerdir --prefpanedir --qlplugindir --mdimporterdir --dictionarydir --fontdir --servicedir --input-methoddir --internet-plugindir --audio-unit-plugindir --vst-plugindir --vst3-plugindir --screen-saverdir --language)--formula[Treat all named arguments as formulae]' \ '*::formula:__brew_formulae' \ - cask \ - '(--formulae --build-from-source --interactive --force-bottle --keep-tmp --debug-symbols --display-times --git)--cask[Treat all named arguments as casks]' \ + '(--formulae --build-from-source --interactive --force-bottle --keep-tmp --debug-symbols --git)--cask[Treat all named arguments as casks]' \ '*::cask:__brew_casks' } @@ -2053,7 +2053,7 @@ _brew_upgrade() { '--debug[If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory]' \ '(--cask)--debug-symbols[Generate debug symbols on build. Source will be retained in a cache directory]' \ '(--formula)--dictionarydir[Target location for Dictionaries (default: `~/Library/Dictionaries`)]' \ - '(--cask)--display-times[Print install times for each package at the end of the run]' \ + '--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`)]' \ @@ -2088,7 +2088,7 @@ _brew_upgrade() { '(--casks --skip-cask-deps --greedy --greedy-latest --greedy-auto-updates --binaries --require-sha --quarantine --appdir --keyboard-layoutdir --colorpickerdir --prefpanedir --qlplugindir --mdimporterdir --dictionarydir --fontdir --servicedir --input-methoddir --internet-plugindir --audio-unit-plugindir --vst-plugindir --vst3-plugindir --screen-saverdir --language)--formula[Treat all named arguments as formulae. If no named arguments are specified, upgrade only outdated formulae]' \ '*::installed_formula:__brew_installed_formulae' \ - installed_cask \ - '(--formulae --build-from-source --interactive --force-bottle --fetch-HEAD --ignore-pinned --keep-tmp --debug-symbols --display-times --overwrite)--cask[Treat all named arguments as casks. If no named arguments are specified, upgrade only outdated casks]' \ + '(--formulae --build-from-source --interactive --force-bottle --fetch-HEAD --ignore-pinned --keep-tmp --debug-symbols --overwrite)--cask[Treat all named arguments as casks. If no named arguments are specified, upgrade only outdated casks]' \ '*::installed_cask:__brew_installed_casks' } diff --git a/docs/Manpage.md b/docs/Manpage.md index 37f4791a55..5d94b69e1f 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -538,6 +538,10 @@ upgrade *`formula`* if it is already installed but outdated. : If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory. +`--display-times` + +: Print install times for each package at the end of the run. + `-f`, `--force` : Install formulae without checking for previously installed keg-only or @@ -624,10 +628,6 @@ upgrade *`formula`* if it is already installed but outdated. : 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 package at the end of the run. - `-i`, `--interactive` : Download and patch *`formula`*, then open a shell. This allows the user to run @@ -980,6 +980,10 @@ the reinstalled formulae or, every 30 days, for all formulae. : If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory. +`--display-times` + +: Print install times for each package at the end of the run. + `-f`, `--force` : Install without checking for previously installed keg-only or non-migrated @@ -1016,10 +1020,6 @@ the reinstalled formulae or, every 30 days, for all formulae. : Generate debug symbols on build. Source will be retained in a cache directory. -`--display-times` - -: Print install times for each formula at the end of the run. - `-g`, `--git` : Create a Git repository, useful for creating patches to the software. @@ -1281,6 +1281,10 @@ the upgraded formulae or, every 30 days, for all formulae. : If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory. +`--display-times` + +: Print install times for each package at the end of the run. + `-f`, `--force` : Install formulae without checking for previously installed keg-only or @@ -1329,10 +1333,6 @@ the upgraded formulae or, every 30 days, for all formulae. : Generate debug symbols on build. Source will be retained in a cache directory. -`--display-times` - -: Print install times for each package at the end of the run. - `--overwrite` : Delete files that already exist in the prefix while linking. diff --git a/manpages/brew.1 b/manpages/brew.1 index 71670f2e47..d068198496 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -338,6 +338,9 @@ Unless \fBHOMEBREW_NO_INSTALL_UPGRADE\fP is set, \fBbrew install\fP \fIformula\f \fB\-d\fP, \fB\-\-debug\fP If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory\. .TP +\fB\-\-display\-times\fP +Print install times for each package at the end of the run\. +.TP \fB\-f\fP, \fB\-\-force\fP Install formulae without checking for previously installed keg\-only or non\-migrated versions\. When installing casks, overwrite existing files (binaries and symlinks are excluded, unless originally from the same cask)\. .TP @@ -389,9 +392,6 @@ Install but skip any post\-install steps\. \fB\-\-bottle\-arch\fP Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on\. .TP -\fB\-\-display\-times\fP -Print install times for each package at the end of the run\. -.TP \fB\-i\fP, \fB\-\-interactive\fP Download and patch \fIformula\fP, then open a shell\. This allows the user to run \fB\&\./configure \-\-help\fP and otherwise determine how to turn the software package into a Homebrew package\. .TP @@ -608,6 +608,9 @@ Unless \fBHOMEBREW_NO_INSTALL_CLEANUP\fP is set, \fBbrew cleanup\fP will then be \fB\-d\fP, \fB\-\-debug\fP If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory\. .TP +\fB\-\-display\-times\fP +Print install times for each package at the end of the run\. +.TP \fB\-f\fP, \fB\-\-force\fP Install without checking for previously installed keg\-only or non\-migrated versions\. .TP @@ -632,9 +635,6 @@ Retain the temporary files created during installation\. \fB\-\-debug\-symbols\fP Generate debug symbols on build\. Source will be retained in a cache directory\. .TP -\fB\-\-display\-times\fP -Print install times for each formula at the end of the run\. -.TP \fB\-g\fP, \fB\-\-git\fP Create a Git repository, useful for creating patches to the software\. .TP @@ -795,6 +795,9 @@ Unless \fBHOMEBREW_NO_INSTALL_CLEANUP\fP is set, \fBbrew cleanup\fP will then be \fB\-d\fP, \fB\-\-debug\fP If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory\. .TP +\fB\-\-display\-times\fP +Print install times for each package at the end of the run\. +.TP \fB\-f\fP, \fB\-\-force\fP Install formulae without checking for previously installed keg\-only or non\-migrated versions\. When installing casks, overwrite existing files (binaries and symlinks are excluded, unless originally from the same cask)\. .TP @@ -825,9 +828,6 @@ Retain the temporary files created during installation\. \fB\-\-debug\-symbols\fP Generate debug symbols on build\. Source will be retained in a cache directory\. .TP -\fB\-\-display\-times\fP -Print install times for each package at the end of the run\. -.TP \fB\-\-overwrite\fP Delete files that already exist in the prefix while linking\. .TP