diff options
| author | Mike McQuaid | 2014-09-24 21:35:07 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2014-10-02 16:03:23 -0700 |
| commit | 26c76381c873a389f36bc7531cdf940a246ef831 (patch) | |
| tree | fc796e825263ae389c435e7a0f8f4e2a89f2191a /Library | |
| parent | cf41b57fe6588a30644eaa9204cc8668d3d7cc9e (diff) | |
| download | brew-26c76381c873a389f36bc7531cdf940a246ef831.tar.bz2 | |
Move SCM wrappers from Contributions to ENV/scm.
Closes Homebrew/homebrew#32615.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| l--------- | Library/ENV/4.3/git | 2 | ||||
| l--------- | Library/ENV/4.3/svn | 2 | ||||
| -rwxr-xr-x | Library/ENV/scm/git (renamed from Library/Contributions/cmd/git) | 0 | ||||
| l--------- | Library/ENV/scm/svn (renamed from Library/Contributions/cmd/svn) | 0 | ||||
| -rwxr-xr-x | Library/brew.rb | 4 |
5 files changed, 5 insertions, 3 deletions
diff --git a/Library/ENV/4.3/git b/Library/ENV/4.3/git index 96b4ab213..ba71181a5 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 b20ea6a2a..e1231dfaa 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 index 888a6ff11..888a6ff11 100755 --- a/Library/Contributions/cmd/git +++ b/Library/ENV/scm/git diff --git a/Library/Contributions/cmd/svn b/Library/ENV/scm/svn index 0899c2993..0899c2993 120000 --- a/Library/Contributions/cmd/svn +++ b/Library/ENV/scm/svn diff --git a/Library/brew.rb b/Library/brew.rb index cd2be0774..422fd2c7b 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: |
