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

brew.rb: update help parsing

Browse Source
This commit is contained in:
Uladzislau Shablinski 2016-10-01 18:17:52 +03:00
parent fd0149783a
commit d92a1ad584
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/brew.rb
View File

@ -32,20 +32,17 @@ begin
empty_argv = ARGV.empty? empty_argv = ARGV.empty?
help_flag_list = %w[-h --help --usage -?] help_flag_list = %w[-h --help --usage -?]
help_flag = false help_flag = !ENV["HOMEBREW_HELP"].nil?
internal_cmd = true internal_cmd = true
cmd = nil cmd = nil
ARGV.dup.each_with_index do |arg, i| ARGV.dup.each_with_index do |arg, i|
break if help_flag && cmd break if help_flag && cmd
if help_flag_list.include?(arg) if arg == "help" && !cmd
# 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. # Command-style help: `help <cmd>` is fine, but `<cmd> help` is not.
help_flag = true help_flag = true
elsif !cmd elsif !cmd && !help_flag_list.include?(arg)
cmd = ARGV.delete_at(i) cmd = ARGV.delete_at(i)
end end
end end