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

diagnostic: improve check for 'gnubin' in PATH

Browse Source 
Both `coreutils` and `findutils` suggest to add `#{opt_libexec}/gnubin`
to PATH in their caveats to get the non-prefixed binaries from those
formulae. Check this in addition to the version-specific directory that
is less likely to be in PATH.

Closes Homebrew/homebrew#48207.

Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
This commit is contained in:
Martin Afanasjew 2016-01-27 00:54:46 +01:00
parent 47d1c2c4e6
commit 9cab301185
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/diagnostic.rb
View File

@ -1198,20 +1198,28 @@ module Homebrew
end end
def check_for_non_prefixed_coreutils def check_for_non_prefixed_coreutils
gnubin = "#{Formulary.factory("coreutils").prefix}/libexec/gnubin" coreutils = Formula["coreutils"]
if paths.include? gnubin then <<-EOS.undent return unless coreutils.any_version_installed?
gnubin = %W[#{coreutils.opt_libexec}/gnubin #{coreutils.libexec}/gnubin]
return if (paths & gnubin).empty?
<<-EOS.undent
Putting non-prefixed coreutils in your path can cause gmp builds to fail. Putting non-prefixed coreutils in your path can cause gmp builds to fail.
EOS EOS
end
end end
def check_for_non_prefixed_findutils def check_for_non_prefixed_findutils
gnubin = "#{Formulary.factory("findutils").prefix}/libexec/gnubin" findutils = Formula["findutils"]
return unless findutils.any_version_installed?
gnubin = %W[#{findutils.opt_libexec}/gnubin #{findutils.libexec}/gnubin]
default_names = Tab.for_name("findutils").with? "default-names" default_names = Tab.for_name("findutils").with? "default-names"
if paths.include?(gnubin) || default_names then <<-EOS.undent return if !default_names && (paths & gnubin).empty?
<<-EOS.undent
Putting non-prefixed findutils in your path can cause python builds to fail. Putting non-prefixed findutils in your path can cause python builds to fail.
EOS EOS
end
end end
def check_for_pydistutils_cfg_in_home def check_for_pydistutils_cfg_in_home