Remove Fink and Macports from the PATH earlier

References issue Homebrew/homebrew#48

2 files changed, 17 insertions, 8 deletions

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 0ec3e2c00..7a5e55fea 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -229,6 +229,23 @@ def diy
   end
 end
 
+
+def fix_PATH
+  bad_paths  = `/usr/bin/which -a port`.split
+  bad_paths += `/usr/bin/which -a fink`.split
+
+  # don't remove standard paths!
+  bad_paths.delete_if do |pn|
+    %w[/usr/bin /bin /usr/sbin /sbin /usr/local/bin /usr/X11/bin].include? pn or pn.empty?
+  end
+  bad_paths += %w[/opt/local/bin /opt/local/sbin /sw/bin /sw/sbin]
+
+  paths = ENV['PATH'].split(':').reject do |p|
+    p.squeeze! '/'
+    bad_paths.find { |pn| p =~ /^#{pn}/ } and true
+  end
+  ENV['PATH'] = paths*':'
+end
 ################################################################ class Cleaner
 class Cleaner
   def initialize f
diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index be22ca675..132bda851 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -175,14 +175,6 @@ end
 ENV.extend HomebrewEnvExtension
 
 
-# remove MacPorts and Fink from the PATH, this prevents issues like:
-# http://github.com/mxcl/homebrew/issues/#issue/13
-paths=ENV['PATH'].split(':').reject do |p|
-  p.squeeze! '/'
-  p =~ %r[^/opt/local] or p =~ %r[^/sw]
-end
-ENV['PATH']=paths*':'
-
 # Clear CDPATH to avoid make issues that depend on changing directories
 ENV.delete('CDPATH')