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

brew.rb: handle -—help for internal/external cmds.

Browse Source 
Only display —-help for internal commands and not for external ones;
they can handle the flag themselves.

Closes Homebrew/homebrew#26675.
References Homebrew/homebrew#26755.
Closes Homebrew/homebrew#30300.
This commit is contained in:
Mike McQuaid 2014-06-25 09:45:01 +01:00
parent 51326e0b63
commit 7ecffd2771
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Library/brew.rb
View File

@ -15,12 +15,7 @@ HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.dirname.parent.join("Lib
$:.unshift(HOMEBREW_LIBRARY_PATH.to_s) $:.unshift(HOMEBREW_LIBRARY_PATH.to_s)
require 'global' require 'global'
if ARGV.empty? || ARGV[0] =~ /(-h$|--help$|--usage$|-\?$|help$)/ if ARGV.first == '--version'
# TODO - `brew help cmd` should display subcommand help
require 'cmd/help'
puts ARGV.usage
exit ARGV.any? ? 0 : 1
elsif ARGV.first == '--version'
puts HOMEBREW_VERSION puts HOMEBREW_VERSION
exit 0 exit 0
elsif ARGV.first == '-v' elsif ARGV.first == '-v'
@ -60,7 +55,6 @@ end
# odd exceptions. Reduce our support burden by showing a user-friendly error. # odd exceptions. Reduce our support burden by showing a user-friendly error.
Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed." Dir.getwd rescue abort "The current working directory doesn't exist, cannot proceed."
def require? path def require? path
require path require path
rescue LoadError => e rescue LoadError => e
@ -88,7 +82,21 @@ begin
'--config' => 'config', '--config' => 'config',
} }
cmd = ARGV.shift empty_argv = ARGV.empty?
help_regex = /(-h$|--help$|--usage$|-\?$|help$)/
help_flag = false
cmd = nil
ARGV.dup.each_with_index do |arg, i|
if help_flag && cmd
break
elsif arg =~ help_regex
help_flag = true
elsif !cmd
cmd = ARGV.delete_at(i)
end
end
cmd = aliases[cmd] if aliases[cmd] cmd = aliases[cmd] if aliases[cmd]
sudo_check = Set.new %w[ install link pin unpin upgrade ] sudo_check = Set.new %w[ install link pin unpin upgrade ]
@ -102,7 +110,23 @@ begin
# Add contributed commands to PATH before checking. # Add contributed commands to PATH before checking.
ENV['PATH'] += "#{File::PATH_SEPARATOR}#{HOMEBREW_CONTRIB}/cmd" ENV['PATH'] += "#{File::PATH_SEPARATOR}#{HOMEBREW_CONTRIB}/cmd"
if require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd)
# Usage instructions should be displayed if and only if one of:
# - a help flag is passed AND an internal command is matched
# - no arguments are passed
#
# It should never affect external commands so they can handle usage
# arguments themselves.
if empty_argv || (internal_cmd && help_flag)
# TODO - `brew help cmd` should display subcommand help
require 'cmd/help'
puts ARGV.usage
exit ARGV.any? ? 0 : 1
end
if internal_cmd
Homebrew.send cmd.to_s.gsub('-', '_').downcase Homebrew.send cmd.to_s.gsub('-', '_').downcase
elsif which "brew-#{cmd}" elsif which "brew-#{cmd}"
%w[CACHE CELLAR LIBRARY_PATH PREFIX REPOSITORY].each do |e| %w[CACHE CELLAR LIBRARY_PATH PREFIX REPOSITORY].each do |e|