From 799a2a456e065f831cdb983cba8f52e40d5c4a78 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 24 Sep 2014 19:43:06 -0500 Subject: [PATCH] Use Dir.glob and array operations to remove whitelisted files --- Library/Homebrew/cmd/doctor.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 2c0d1bf4a1..4ec3697378 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -107,16 +107,10 @@ def __check_stray_files(dir, pattern, white_list, message) return unless File.directory?(dir) files = Dir.chdir(dir) { - Dir[pattern].select { |f| File.file?(f) && !File.symlink?(f) } - } + Dir[pattern].select { |f| File.file?(f) && !File.symlink?(f) } - Dir.glob(white_list) + }.map { |file| File.join(dir, file) } - bad = files.reject { |file| - white_list.any? { |pat| File.fnmatch?(pat, file) } - } - - bad.map! { |file| File.join(dir, file) } - - inject_file_list(bad, message) unless bad.empty? + inject_file_list(files, message) unless files.empty? end def check_for_stray_dylibs