Use Dir.glob and array operations to remove whitelisted files

This commit is contained in:
Jack Nagel 2014-09-24 19:43:06 -05:00
parent 586756209c
commit 799a2a456e

View File

@ -107,16 +107,10 @@ def __check_stray_files(dir, pattern, white_list, message)
return unless File.directory?(dir) return unless File.directory?(dir)
files = Dir.chdir(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| inject_file_list(files, message) unless files.empty?
white_list.any? { |pat| File.fnmatch?(pat, file) }
}
bad.map! { |file| File.join(dir, file) }
inject_file_list(bad, message) unless bad.empty?
end end
def check_for_stray_dylibs def check_for_stray_dylibs