From 16faf6fca94625988ebcd8e1419acda478b2ef52 Mon Sep 17 00:00:00 2001 From: "L. E. Segovia" Date: Wed, 18 Oct 2017 08:47:52 -0300 Subject: [PATCH] Shorten HOMEBREW_HELP set/unset --- Library/Homebrew/brew.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index ef8b28aa9c..6fd9c75c1f 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -116,16 +116,11 @@ begin if Process.uid.zero? && !brew_uid.zero? tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] end - if help_flag - # Unset HOMEBREW_HELP to avoid confusing the tap - ENV.delete("HOMEBREW_HELP") - end + # Unset HOMEBREW_HELP to avoid confusing the tap + ENV.delete("HOMEBREW_HELP") if help_flag tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}] safe_system(*tap_commands) - if help_flag - # Restore HOMEBREW_HELP after the tap - ENV["HOMEBREW_HELP"] = "1" - end + ENV["HOMEBREW_HELP"] = "1" if help_flag exec HOMEBREW_BREW_FILE, cmd, *ARGV end rescue UsageError => e