diff options
| author | Jack Nagel | 2012-06-12 00:17:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-06-12 00:17:36 -0500 |
| commit | 79772aa31d4af4247c08c647f76004b9f94d8d59 (patch) | |
| tree | 34e3d4bc831bac101756166583fd5ce4fc58e6a4 /Library | |
| parent | cbb72eaaaac1c62256d7351c498a90f66703f619 (diff) | |
| download | homebrew-79772aa31d4af4247c08c647f76004b9f94d8d59.tar.bz2 | |
Use which method in doctor
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index f22e57e92..ea7c1f8c4 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -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(':') |
