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

brew.rb: cleanup PATH setup.

Browse Source 
Avoid adding all the tap commands to the PATH when not necessary.
This commit is contained in:
Mike McQuaid 2017-10-28 19:49:25 +01:00
parent f0b25b5482
commit 29f81812cc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/brew.rb
View File

@ -50,11 +50,6 @@ begin
path = PATH.new(ENV["PATH"]) path = PATH.new(ENV["PATH"])
homebrew_path = PATH.new(ENV["HOMEBREW_PATH"]) homebrew_path = PATH.new(ENV["HOMEBREW_PATH"])
# Add contributed commands to PATH before checking.
tap_cmds = Pathname.glob(Tap::TAP_DIRECTORY/"*/*/cmd")
path.append(tap_cmds)
homebrew_path.append(tap_cmds)
# Add SCM wrappers. # Add SCM wrappers.
path.append(HOMEBREW_SHIMS_PATH/"scm") path.append(HOMEBREW_SHIMS_PATH/"scm")
homebrew_path.append(HOMEBREW_SHIMS_PATH/"scm") homebrew_path.append(HOMEBREW_SHIMS_PATH/"scm")
@ -93,8 +88,14 @@ begin
system(HOMEBREW_BREW_FILE, "uninstall", "--force", "brew-cask") system(HOMEBREW_BREW_FILE, "uninstall", "--force", "brew-cask")
end end
# External commands expect a normal PATH unless internal_cmd
ENV["PATH"] = homebrew_path unless internal_cmd # Add contributed commands to PATH before checking.
tap_cmds = Pathname.glob(Tap::TAP_DIRECTORY/"*/*/cmd")
homebrew_path.append(tap_cmds)
# External commands expect a normal PATH
ENV["PATH"] = homebrew_path
end
if internal_cmd if internal_cmd
Homebrew.send cmd.to_s.tr("-", "_").downcase Homebrew.send cmd.to_s.tr("-", "_").downcase