From 26c76381c873a389f36bc7531cdf940a246ef831 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 24 Sep 2014 21:35:07 -0700
Subject: [PATCH] Move SCM wrappers from Contributions to ENV/scm.

Closes Homebrew/homebrew#32615.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/ENV/4.3/git                        | 2 +-
 Library/ENV/4.3/svn                        | 2 +-
 Library/{Contributions/cmd => ENV/scm}/git | 0
 Library/{Contributions/cmd => ENV/scm}/svn | 0
 Library/brew.rb                            | 4 +++-
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename Library/{Contributions/cmd => ENV/scm}/git (100%)
 rename Library/{Contributions/cmd => ENV/scm}/svn (100%)

diff --git a/Library/ENV/4.3/git b/Library/ENV/4.3/git
index 96b4ab213e..ba71181a5e 120000
--- a/Library/ENV/4.3/git
+++ b/Library/ENV/4.3/git
@@ -1 +1 @@
-../../Contributions/cmd/git
\ No newline at end of file
+../scm/git
\ No newline at end of file
diff --git a/Library/ENV/4.3/svn b/Library/ENV/4.3/svn
index b20ea6a2a4..e1231dfaaa 120000
--- a/Library/ENV/4.3/svn
+++ b/Library/ENV/4.3/svn
@@ -1 +1 @@
-../../Contributions/cmd/svn
\ No newline at end of file
+../scm/svn
\ No newline at end of file
diff --git a/Library/Contributions/cmd/git b/Library/ENV/scm/git
similarity index 100%
rename from Library/Contributions/cmd/git
rename to Library/ENV/scm/git
diff --git a/Library/Contributions/cmd/svn b/Library/ENV/scm/svn
similarity index 100%
rename from Library/Contributions/cmd/svn
rename to Library/ENV/scm/svn
diff --git a/Library/brew.rb b/Library/brew.rb
index cd2be07746..422fd2c7b3 100755
--- a/Library/brew.rb
+++ b/Library/brew.rb
@@ -108,11 +108,13 @@ begin
   end
 
   # 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|
     ENV["PATH"] += "#{File::PATH_SEPARATOR}#{tap_cmd_dir}"
   end
 
+  # Add SCM wrappers.
+  ENV["PATH"] += "#{File::PATH_SEPARATOR}#{HOMEBREW_LIBRARY}/ENV/scm"
+
   internal_cmd = require? HOMEBREW_LIBRARY_PATH.join("cmd", cmd) if cmd
 
   # Usage instructions should be displayed if and only if one of: