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

Fixes Homebrew/homebrew#10369; Doctor output is unreadable.

Browse Source
This commit is contained in:
Max Howell 2012-02-21 15:50:35 +00:00
parent bb6816dc4a
commit 8cbaca5b76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/doctor.rb
View File

@ -350,15 +350,16 @@ def check_user_path
# only show the doctor message if there are any conflicts # only show the doctor message if there are any conflicts
# rationale: a default install should not trigger any brew doctor messages # rationale: a default install should not trigger any brew doctor messages
conflicts = Dir["#{HOMEBREW_PREFIX}/bin/*"]. conflicts = Dir["#{HOMEBREW_PREFIX}/bin/*"].
select {|fn| File.exist? "/usr/bin/#{File.basename fn}"}. map{ |fn| File.basename fn }.
map {|fn| File.basename fn} select{ |bn| File.exist? "/usr/bin/#{bn}" }
if conflicts.size if conflicts.size
ohai "/usr/bin occurs before #{HOMEBREW_PREFIX}/bin" ohai "/usr/bin occurs before #{HOMEBREW_PREFIX}/bin"
puts <<-EOS.undent puts <<-EOS.undent
This means that system-provided programs will be used instead of those This means that system-provided programs will be used instead of those
provided by Homebrew. The following tools exist at both paths: provided by Homebrew. The following tools exist at both paths:
#{conflicts * "\n "} #{conflicts * "\n "}
Consider editing your .bashrc to put #{HOMEBREW_PREFIX}/bin Consider editing your .bashrc to put #{HOMEBREW_PREFIX}/bin
ahead of /usr/bin in your PATH. ahead of /usr/bin in your PATH.