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

Use which method in doctor

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-06-12 00:17:36 -05:00
parent 0c14036a9a
commit 9e2fc82ad6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,23 +457,22 @@ def check_user_path_3
end
def check_which_pkg_config
binary = `/usr/bin/which pkg-config`.chomp
return if binary.empty?
binary = which 'pkg-config'
return if binary.nil?
unless binary == "#{HOMEBREW_PREFIX}/bin/pkg-config"
<<-EOS.undent
You have a non-brew 'pkg-config' in your PATH:
#{binary}
unless binary.to_s == "#{HOMEBREW_PREFIX}/bin/pkg-config" then <<-EOS.undent
You have a non-Homebrew 'pkg-config' in your PATH:
#{binary}
`./configure` may have problems finding brew-installed packages using
this other pkg-config.
`./configure` may have problems finding brew-installed packages using
this other pkg-config.
EOS
end
end
def check_pkg_config_paths
binary = `/usr/bin/which pkg-config`.chomp
return if binary.empty?
binary = which 'pkg-config'
return if binary.nil?
pkg_config_paths = `pkg-config --variable pc_path pkg-config`.chomp.split(':')