admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew.rb: don't show help for 'brew <command> help'

Browse Source 
Showing help makes sense for `brew help <command>`, but showing it for
`brew <command> help` is undesirable and prevents all commands from
accepting a named argument `help` (formula, tap, file name, etc.).

All other help flags are still detected before *and* after the command.

Closes #103.

Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
This commit is contained in:
Martin Afanasjew 2016-04-17 04:07:36 +02:00
parent c6536066dc
commit f15b631875
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/brew.rb
View File

@ -30,7 +30,7 @@ begin
trap("INT", std_trap) # restore default CTRL-C handler
empty_argv = ARGV.empty?
help_flag_list = %w[-h --help --usage -? help]
help_flag_list = %w[-h --help --usage -?]
help_flag = false
internal_cmd = true
cmd = nil
@ -38,7 +38,11 @@ begin
ARGV.dup.each_with_index do |arg, i|
if help_flag && cmd
break
elsif help_flag_list.include? arg
elsif help_flag_list.include?(arg)
# Option-style help: Both `--help <cmd>` and `<cmd> --help` are fine.
help_flag = true
elsif arg == "help" && !cmd
# Command-style help: `help <cmd>` is fine, but `<cmd> help` is not.
help_flag = true
elsif !cmd
cmd = ARGV.delete_at(i)