From 151c2861acad30b587c8aee1c3131643a7fc15ca Mon Sep 17 00:00:00 2001 From: Dan Wendorf Date: Sat, 18 Nov 2017 17:04:54 -0800 Subject: [PATCH] Custom commands can show help We attempted to find the help message for commands before loading custom commands in the path. --- Library/Homebrew/brew.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index bb663537d7..f31224ab25 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -69,6 +69,14 @@ begin end end + unless internal_cmd + # Add contributed commands to PATH before checking. + homebrew_path.append(Tap.cmd_directories) + + # External commands expect a normal PATH + ENV["PATH"] = homebrew_path + end + # Usage instructions should be displayed if and only if one of: # - a help flag is passed AND a command is matched # - a help flag is passed AND there is no command specified @@ -88,14 +96,6 @@ begin system(HOMEBREW_BREW_FILE, "uninstall", "--force", "brew-cask") end - unless internal_cmd - # Add contributed commands to PATH before checking. - homebrew_path.append(Tap.cmd_directories) - - # External commands expect a normal PATH - ENV["PATH"] = homebrew_path - end - if internal_cmd Homebrew.send cmd.to_s.tr("-", "_").downcase elsif which "brew-#{cmd}"