Make --version/--verbose slightly less confusing.

This commit is contained in:
Adam Vandenberg 2012-07-23 14:27:50 -07:00
parent ad32b663e8
commit 7a7e3b5f7c
3 changed files with 14 additions and 18 deletions

View File

@ -3,8 +3,8 @@ brew(1) -- The missing package manager for OS X
## SYNOPSIS ## SYNOPSIS
`brew` [--verbose|-v] command [options] [formula] ... `brew` --version
`brew` [--version|-v] `brew` [--verbose|-v] command [options] [formula] ...
## DESCRIPTION ## DESCRIPTION
@ -13,8 +13,7 @@ didn't include with OS X.
## OPTIONS ## OPTIONS
* `-v`, `--verbose` command [options] [formula] ...: * `-v`, `--verbose` command [options] [formula] ...:
Prints extra, command-specific debugging information. With `--verbose`, many commands print extra debugging information.
Note that `brew -v` by itself is the same as `brew --version`.
## ESSENTIAL COMMANDS ## ESSENTIAL COMMANDS
@ -326,7 +325,7 @@ For the full command list, see the COMMANDS section.
Display where Homebrew's `.git` directory is located. For standard installs, Display where Homebrew's `.git` directory is located. For standard installs,
the `prefix` and `repository` are the same directory. the `prefix` and `repository` are the same directory.
* `-v`, `--version`: * `--version`:
Print the version number of brew to standard error and exit. Print the version number of brew to standard error and exit.
## EXTERNAL COMMANDS ## EXTERNAL COMMANDS

View File

@ -17,14 +17,11 @@ when '--version'
puts HOMEBREW_VERSION puts HOMEBREW_VERSION
exit 0 exit 0
when '-v' when '-v'
if ARGV.length > 1 puts "Homebrew #{HOMEBREW_VERSION}"
puts "Homebrew #{HOMEBREW_VERSION}" # Shift the -v to the end of the parameter list
# continue in verbose mode ARGV << ARGV.shift
ARGV << ARGV.shift # If no other arguments, just quit here.
else exit 0 if ARGV.length == 1
puts HOMEBREW_VERSION
exit 0
end
end end
case HOMEBREW_PREFIX.to_s when '/', '/usr' case HOMEBREW_PREFIX.to_s when '/', '/usr'

View File

@ -1,16 +1,16 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "BREW" "1" "June 2012" "Homebrew" "brew" .TH "BREW" "1" "July 2012" "Homebrew" "brew"
. .
.SH "NAME" .SH "NAME"
\fBbrew\fR \- The missing package manager for OS X \fBbrew\fR \- The missing package manager for OS X
. .
.SH "SYNOPSIS" .SH "SYNOPSIS"
\fBbrew\fR [\-\-verbose|\-v] command [options] [formula] \.\.\. \fBbrew\fR \-\-version
. .
.br .br
\fBbrew\fR [\-\-version|\-v] \fBbrew\fR [\-v|\-\-verbose] command [options] [formula] \.\.\.
. .
.SH "DESCRIPTION" .SH "DESCRIPTION"
Homebrew is the easiest and most flexible way to install the UNIX tools Apple didn\'t include with OS X\. Homebrew is the easiest and most flexible way to install the UNIX tools Apple didn\'t include with OS X\.
@ -19,7 +19,7 @@ Homebrew is the easiest and most flexible way to install the UNIX tools Apple di
. .
.TP .TP
\fB\-v\fR, \fB\-\-verbose\fR command [options] [formula] \.\.\. \fB\-v\fR, \fB\-\-verbose\fR command [options] [formula] \.\.\.
Prints extra, command\-specific debugging information\. Note that \fBbrew \-v\fR by itself is the same as \fBbrew \-\-version\fR\. With \fB\-\-verbose\fR, many commands print extra debugging information\.
. .
.SH "ESSENTIAL COMMANDS" .SH "ESSENTIAL COMMANDS"
For the full command list, see the COMMANDS section\. For the full command list, see the COMMANDS section\.
@ -363,7 +363,7 @@ Display the location in the cellar where \fIformula\fR is or would be installed\
Display where Homebrew\'s \fB\.git\fR directory is located\. For standard installs, the \fBprefix\fR and \fBrepository\fR are the same directory\. Display where Homebrew\'s \fB\.git\fR directory is located\. For standard installs, the \fBprefix\fR and \fBrepository\fR are the same directory\.
. .
.TP .TP
\fB\-v\fR, \fB\-\-version\fR \fB\-\-version\fR
Print the version number of brew to standard error and exit\. Print the version number of brew to standard error and exit\.
. .
.SH "EXTERNAL COMMANDS" .SH "EXTERNAL COMMANDS"