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

Simplify config script doctor check

Browse Source
This commit is contained in:
Jack Nagel 2014-10-28 22:49:40 -05:00
parent d494c9db8e
commit f281ea3a57
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -654,20 +654,20 @@ def check_for_config_scripts
return unless HOMEBREW_CELLAR.exist? return unless HOMEBREW_CELLAR.exist?
real_cellar = HOMEBREW_CELLAR.realpath real_cellar = HOMEBREW_CELLAR.realpath
config_scripts = [] scripts = []
whitelist = %W[/usr/bin /usr/sbin /usr/X11/bin /usr/X11R6/bin /opt/X11/bin #{HOMEBREW_PREFIX}/bin #{HOMEBREW_PREFIX}/sbin] whitelist = %W[/usr/bin /usr/sbin /usr/X11/bin /usr/X11R6/bin /opt/X11/bin #{HOMEBREW_PREFIX}/bin #{HOMEBREW_PREFIX}/sbin]
whitelist.map! { |d| d.downcase } whitelist.map! { |d| d.downcase }
paths.each do |p| paths.each do |p|
next if whitelist.include? p.downcase next if whitelist.include?(p.downcase) ||
next if p.start_with?(real_cellar.to_s, HOMEBREW_CELLAR.to_s) p.start_with?(real_cellar.to_s, HOMEBREW_CELLAR.to_s) ||
!File.directory?(p)
configs = Dir["#{p}/*-config"] scripts += Dir.chdir(p) { Dir["*-config"] }.map { |c| File.join(p, c) }
config_scripts << [p, configs.map { |c| File.basename(c) }] unless configs.empty?
end end
unless config_scripts.empty? unless scripts.empty?
s = <<-EOS.undent s = <<-EOS.undent
"config" scripts exist outside your system or Homebrew directories. "config" scripts exist outside your system or Homebrew directories.
`./configure` scripts often look for *-config scripts to determine if `./configure` scripts often look for *-config scripts to determine if
@ -680,10 +680,7 @@ def check_for_config_scripts
EOS EOS
config_scripts.each do |dir, files| s << scripts.map { |f| " #{f}" }.join("\n")
files.each { |fn| s << " #{dir}/#{fn}\n" }
end
s
end end
end end