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

Put user's PATHs at end of superenv PATH

Browse Source 
Making sure to remove X11, should be safe if this order is kept.

Refs Homebrew/homebrew#14519.
Fixes Homebrew/homebrew#14544.
This commit is contained in:
Max Howell 2012-08-30 09:45:07 -04:00
parent be8827d8a4
commit ea12f340e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/superenv.rb
View File

@ -104,6 +104,7 @@ class << ENV
paths << HOMEBREW_PREFIX/:bin paths << HOMEBREW_PREFIX/:bin
paths << "#{MacSystem.x11_prefix}/bin" if x11? paths << "#{MacSystem.x11_prefix}/bin" if x11?
paths += %w{/usr/bin /bin /usr/sbin /sbin} paths += %w{/usr/bin /bin /usr/sbin /sbin}
paths += ORIGINAL_PATHS.map{|pn| pn.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin}
paths.to_path_s paths.to_path_s
end end
@ -213,7 +214,7 @@ end
class Array class Array
def to_path_s def to_path_s
map(&:to_s).select{|s| s and File.directory? s }.join(':').chuzzle map(&:to_s).uniq.select{|s| File.directory? s }.join(':').chuzzle
end end
end end