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

Only unset HOMEBREW_HELP before issuing the tap

Browse Source
This commit is contained in:
L. E. Segovia 2017-10-18 08:30:26 -03:00
parent 0998e16e81
commit fd2b0d21c4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/brew.rb
View File

@ -32,7 +32,7 @@ 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
@ -119,8 +119,16 @@ begin
if Process.uid.zero? && !brew_uid.zero? if Process.uid.zero? && !brew_uid.zero?
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}]
end end
if help_flag
# Unset HOMEBREW_HELP to avoid confusing the tap
ENV["HOMEBREW_HELP"] = nil
end
tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}] tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}]
safe_system(*tap_commands) safe_system(*tap_commands)
if help_flag
# Restore HOMEBREW_HELP after the tap
ENV["HOMEBREW_HELP"] = 1
end
exec HOMEBREW_BREW_FILE, cmd, *ARGV exec HOMEBREW_BREW_FILE, cmd, *ARGV
end end
rescue UsageError => e rescue UsageError => e