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

Correct setting and deleting HOMEBREW_HELP

Browse Source 
(and also delete the extra help_flag case, it's no longer needed)
This commit is contained in:
L. E. Segovia 2017-10-18 08:37:24 -03:00
parent fd2b0d21c4
commit 098305e679
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/brew.rb
View File

@ -44,9 +44,6 @@ begin
help_flag = true help_flag = true
elsif !cmd && !help_flag_list.include?(arg) elsif !cmd && !help_flag_list.include?(arg)
cmd = ARGV.delete_at(i) cmd = ARGV.delete_at(i)
elsif help_flag_list.include?(arg) && cmd
# cmd determined, and it needs help
help_flag = true
end end
end end
@ -121,13 +118,13 @@ begin
end end
if help_flag if help_flag
# Unset HOMEBREW_HELP to avoid confusing the tap # Unset HOMEBREW_HELP to avoid confusing the tap
ENV["HOMEBREW_HELP"] = nil ENV.delete("HOMEBREW_HELP")
end 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 if help_flag
# Restore HOMEBREW_HELP after the tap # Restore HOMEBREW_HELP after the tap
ENV["HOMEBREW_HELP"] = 1 ENV["HOMEBREW_HELP"] = "1"
end end
exec HOMEBREW_BREW_FILE, cmd, *ARGV exec HOMEBREW_BREW_FILE, cmd, *ARGV
end end