From ac091437e5b2ae8ca21058cf47184f1788c8d697 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 8 Feb 2017 00:12:50 -0800 Subject: renamed where to formula --- Library/Homebrew/cmd/help.rb | 2 +- Library/Homebrew/dev-cmd/formula.rb | 15 +++++++++++++++ Library/Homebrew/dev-cmd/where.rb | 15 --------------- completions/zsh/_brew | 2 +- docs/brew.1.html | 2 +- manpages/brew.1 | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 Library/Homebrew/dev-cmd/formula.rb delete mode 100644 Library/Homebrew/dev-cmd/where.rb diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb index 70379314e..669f92ddd 100644 --- a/Library/Homebrew/cmd/help.rb +++ b/Library/Homebrew/cmd/help.rb @@ -15,7 +15,7 @@ Troubleshooting: Developers: brew create [URL [--no-fetch]] - brew (where|edit) [FORMULA...] + brew (formula|edit) [FORMULA...] http://docs.brew.sh/Formula-Cookbook.html Further help: diff --git a/Library/Homebrew/dev-cmd/formula.rb b/Library/Homebrew/dev-cmd/formula.rb new file mode 100644 index 000000000..80008a354 --- /dev/null +++ b/Library/Homebrew/dev-cmd/formula.rb @@ -0,0 +1,15 @@ +#: * `formula` : +#: echo location of the specified to stdout + +require "formula" + +module Homebrew + module_function + + def formula + raise FormulaUnspecifiedError if ARGV.named.empty? + ARGV.resolved_formulae.each do |f| + puts "#{f.path}\n" + end + end +end diff --git a/Library/Homebrew/dev-cmd/where.rb b/Library/Homebrew/dev-cmd/where.rb deleted file mode 100644 index 63237301b..000000000 --- a/Library/Homebrew/dev-cmd/where.rb +++ /dev/null @@ -1,15 +0,0 @@ -#: * `where` : -#: echo location of the specified to stdout - -require "formula" - -module Homebrew - module_function - - def where - raise FormulaUnspecifiedError if ARGV.named.empty? - ARGV.resolved_formulae.each do |f| - puts "#{f.path}\n" - end - end -end diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 8b1ac2ede..5d3924357 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -88,6 +88,7 @@ __brew_common_commands() { 'doctor:audits your installation for common issues' 'edit:edit a formula' 'fetch:download formula resources to the cache' + 'formula:location of formulae' 'gist-logs:generate a gist of the full build logs' 'home:visit the homepage of a formula or the brew project' 'info:information about a formula' @@ -120,7 +121,6 @@ __brew_common_commands() { 'update:fetch latest version of Homebrew and all formulae' 'upgrade:upgrade outdated formulae' 'uses:show formulae which depend on a formula' - 'where:location of formulae' '--cellar:brew cellar' '--env:brew environment' '--repository:brew repository' diff --git a/docs/brew.1.html b/docs/brew.1.html index e16b47412..58a1dccca 100644 --- a/docs/brew.1.html +++ b/docs/brew.1.html @@ -537,6 +537,7 @@ you to explicitly set the name and version of the package you are creating.

the specified tap.

edit

Open all of Homebrew for editing.

edit formula

Open formula in the editor.

+
formula formulae

echo location of the specified formulae to stdout

linkage [--test] [--reverse] formula-name

Checks the library links of an installed formula.

Only works on installed formulae. An error is raised if it is run on @@ -625,7 +626,6 @@ between tags.

If --keep-tmp is passed, retain the temporary directory containing the new repository clone.

-
where formulae

echo location of the specified formulae to stdout

diff --git a/manpages/brew.1 b/manpages/brew.1 index 27a3a6949..7c151eebd 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -728,6 +728,10 @@ Open all of Homebrew for editing\. Open \fIformula\fR in the editor\. . .TP +\fBformula\fR \fIformulae\fR +echo location of the specified \fIformulae\fR to stdout +. +.TP \fBlinkage\fR [\fB\-\-test\fR] [\fB\-\-reverse\fR] \fIformula\-name\fR Checks the library links of an installed formula\. . @@ -823,10 +827,6 @@ If \fB\-\-to\-tag\fR is passed, set HOMEBREW_UPDATE_TO_TAG to test updating betw .IP If \fB\-\-keep\-tmp\fR is passed, retain the temporary directory containing the new repository clone\. . -.TP -\fBwhere\fR \fIformulae\fR -echo location of the specified \fIformulae\fR to stdout -. .SH "OFFICIAL EXTERNAL COMMANDS" . .TP -- cgit v1.2.3