Move SCM wrappers from Contributions to ENV/scm.

Closes Homebrew/homebrew#32615.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2014-09-24 21:35:07 -07:00
parent cf41b57fe6
commit 26c76381c8
5 changed files with 5 additions and 3 deletions

View File

@ -1 +1 @@
../../Contributions/cmd/git ../scm/git

View File

@ -1 +1 @@
../../Contributions/cmd/svn ../scm/svn

View File

@ -108,11 +108,13 @@ begin
end end
# Add contributed commands to PATH before checking. # Add contributed commands to PATH before checking.
ENV['PATH'] += "#{File::PATH_SEPARATOR}#{HOMEBREW_CONTRIB}/cmd"
Dir["#{HOMEBREW_LIBRARY}/Taps/*/*/cmd"].each do |tap_cmd_dir| Dir["#{HOMEBREW_LIBRARY}/Taps/*/*/cmd"].each do |tap_cmd_dir|
ENV["PATH"] += "#{File::PATH_SEPARATOR}#{tap_cmd_dir}" ENV["PATH"] += "#{File::PATH_SEPARATOR}#{tap_cmd_dir}"
end end
# Add SCM wrappers.
ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_LIBRARY}/ENV/scm"
internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) if cmd internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) if cmd
# Usage instructions should be displayed if and only if one of: # Usage instructions should be displayed if and only if one of: