diff --git a/Library/Homebrew/cmd/--cache.rb b/Library/Homebrew/cmd/--cache.rb index de6c1ac0a0..1dd0bb2c5e 100644 --- a/Library/Homebrew/cmd/--cache.rb +++ b/Library/Homebrew/cmd/--cache.rb @@ -22,9 +22,9 @@ module Homebrew switch "--force-bottle", description: "Show the cache file used when pouring a bottle." switch "--formula", - description: "Show cache files for only formulae" + description: "Only show cache files for formulae." switch "--cask", - description: "Show cache files for only casks" + description: "Only show cache files for casks." conflicts "--build-from-source", "--force-bottle" conflicts "--formula", "--cask" end diff --git a/Library/Homebrew/dev-cmd/mirror.rb b/Library/Homebrew/dev-cmd/mirror.rb index e124175205..25c6317363 100644 --- a/Library/Homebrew/dev-cmd/mirror.rb +++ b/Library/Homebrew/dev-cmd/mirror.rb @@ -13,10 +13,10 @@ module Homebrew Reupload the stable URL of a formula to Bintray for use as a mirror. EOS - flag "--bintray-org=", - description: "Upload to the specified Bintray organisation (default: homebrew)." - flag "--bintray-repo=", - description: "Upload to the specified Bintray repository (default: mirror)." + flag "--bintray-org=", + description: "Upload to the specified Bintray organisation (default: `homebrew`)." + flag "--bintray-repo=", + description: "Upload to the specified Bintray repository (default: `mirror`)." switch "--no-publish", description: "Upload to Bintray, but don't publish." switch :verbose diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index bbd1b097e4..c5f82ec116 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -34,18 +34,18 @@ module Homebrew description: "When a patch fails to apply, leave in progress and allow user to resolve, "\ "instead of aborting." flag "--workflow=", - description: "Retrieve artifacts from the specified workflow (default: tests.yml)." + description: "Retrieve artifacts from the specified workflow (default: `tests.yml`)." flag "--artifact=", - description: "Download artifacts with the specified name (default: bottles)." + description: "Download artifacts with the specified name (default: `bottles`)." flag "--bintray-org=", - description: "Upload to the specified Bintray organisation (default: homebrew)." + description: "Upload to the specified Bintray organisation (default: `homebrew`)." flag "--tap=", - description: "Target tap repository (default: homebrew/core)." + description: "Target tap repository (default: `homebrew/core`)." flag "--root-url=", description: "Use the specified as the root of the bottle's URL instead of Homebrew's default." flag "--bintray-mirror=", description: "Use the specified Bintray repository to automatically mirror stable URLs "\ - "defined in the formulae (default: mirror)" + "defined in the formulae (default: `mirror`)." switch :verbose switch :debug min_named 1 diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb index 86b1d83717..f591bf77dd 100644 --- a/Library/Homebrew/dev-cmd/pr-upload.rb +++ b/Library/Homebrew/dev-cmd/pr-upload.rb @@ -15,12 +15,12 @@ module Homebrew EOS switch "--no-publish", description: "Apply the bottle commit and upload the bottles, but don't publish them." - switch "--dry-run", "-n", + switch "-n", "--dry-run", description: "Print what would be done rather than doing it." - flag "--bintray-org=", - description: "Upload to the specified Bintray organisation (default: homebrew)." - flag "--root-url=", - description: "Use the specified as the root of the bottle's URL instead of Homebrew's default." + flag "--bintray-org=", + description: "Upload to the specified Bintray organisation (default: `homebrew`)." + flag "--root-url=", + description: "Use the specified as the root of the bottle's URL instead of Homebrew's default." switch :verbose switch :debug end diff --git a/Library/Homebrew/help.rb b/Library/Homebrew/help.rb index 0e41977c72..57196edf7c 100644 --- a/Library/Homebrew/help.rb +++ b/Library/Homebrew/help.rb @@ -103,7 +103,7 @@ module Homebrew help_lines = command_help_lines(path) return if help_lines.blank? - Formatter.wrap(help_lines.join.delete_prefix(" "), COMMAND_DESC_WIDTH) + Formatter.wrap(help_lines.join, COMMAND_DESC_WIDTH) .sub("@hide_from_man_page ", "") .sub(/^\* /, "#{Tty.bold}Usage: brew#{Tty.reset} ") .gsub(/`(.*?)`/m, "#{Tty.bold}\\1#{Tty.reset}") diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 3ddf50c79c..254ac11ea1 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -497,7 +497,7 @@ module Kernel path.read .lines .grep(/^#:/) - .map { |line| line.slice(2..-1) } + .map { |line| line.slice(2..-1).delete_prefix(" ") } end def redact_secrets(input, secrets) diff --git a/docs/Manpage.md b/docs/Manpage.md index badba2af06..5c36232648 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -588,9 +588,9 @@ If *`formula`* is provided, display the file or directory used to cache *`formul * `--force-bottle`: Show the cache file used when pouring a bottle. * `--formula`: - Show cache files for only formulae + Only show cache files for formulae. * `--cask`: - Show cache files for only casks + Only show cache files for casks. ### `--cellar` [*`formula`*] @@ -900,17 +900,17 @@ repository. * `--resolve`: When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting. * `--workflow`: - Retrieve artifacts from the specified workflow (default: tests.yml). + Retrieve artifacts from the specified workflow (default: `tests.yml`). * `--artifact`: - Download artifacts with the specified name (default: bottles). + Download artifacts with the specified name (default: `bottles`). * `--bintray-org`: - Upload to the specified Bintray organisation (default: homebrew). + Upload to the specified Bintray organisation (default: `homebrew`). * `--tap`: - Target tap repository (default: homebrew/core). + Target tap repository (default: `homebrew/core`). * `--root-url`: Use the specified *`URL`* as the root of the bottle's URL instead of Homebrew's default. * `--bintray-mirror`: - Use the specified Bintray repository to automatically mirror stable URLs defined in the formulae (default: mirror) + Use the specified Bintray repository to automatically mirror stable URLs defined in the formulae (default: `mirror`). ### `pr-upload` [*`options`*] @@ -921,7 +921,7 @@ Apply the bottle commit and publish bottles to Bintray. * `-n`, `--dry-run`: Print what would be done rather than doing it. * `--bintray-org`: - Upload to the specified Bintray organisation (default: homebrew). + Upload to the specified Bintray organisation (default: `homebrew`). * `--root-url`: Use the specified *`URL`* as the root of the bottle's URL instead of Homebrew's default. diff --git a/manpages/brew.1 b/manpages/brew.1 index 1025c62d50..b3ed4b1578 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -765,11 +765,11 @@ Show the cache file used when pouring a bottle\. . .TP \fB\-\-formula\fR -Show cache files for only formulae +Only show cache files for formulae\. . .TP \fB\-\-cask\fR -Show cache files for only casks +Only show cache files for casks\. . .SS "\fB\-\-cellar\fR [\fIformula\fR]" Display Homebrew\'s Cellar path\. \fIDefault:\fR \fB$(brew \-\-prefix)/Cellar\fR, or if that directory doesn\'t exist, \fB$(brew \-\-repository)/Cellar\fR\. @@ -1169,19 +1169,19 @@ When a patch fails to apply, leave in progress and allow user to resolve, instea . .TP \fB\-\-workflow\fR -Retrieve artifacts from the specified workflow (default: tests\.yml)\. +Retrieve artifacts from the specified workflow (default: \fBtests\.yml\fR)\. . .TP \fB\-\-artifact\fR -Download artifacts with the specified name (default: bottles)\. +Download artifacts with the specified name (default: \fBbottles\fR)\. . .TP \fB\-\-bintray\-org\fR -Upload to the specified Bintray organisation (default: homebrew)\. +Upload to the specified Bintray organisation (default: \fBhomebrew\fR)\. . .TP \fB\-\-tap\fR -Target tap repository (default: homebrew/core)\. +Target tap repository (default: \fBhomebrew/core\fR)\. . .TP \fB\-\-root\-url\fR @@ -1189,7 +1189,7 @@ Use the specified \fIURL\fR as the root of the bottle\'s URL instead of Homebrew . .TP \fB\-\-bintray\-mirror\fR -Use the specified Bintray repository to automatically mirror stable URLs defined in the formulae (default: mirror) +Use the specified Bintray repository to automatically mirror stable URLs defined in the formulae (default: \fBmirror\fR)\. . .SS "\fBpr\-upload\fR [\fIoptions\fR]" Apply the bottle commit and publish bottles to Bintray\. @@ -1204,7 +1204,7 @@ Print what would be done rather than doing it\. . .TP \fB\-\-bintray\-org\fR -Upload to the specified Bintray organisation (default: homebrew)\. +Upload to the specified Bintray organisation (default: \fBhomebrew\fR)\. . .TP \fB\-\-root\-url\fR