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

Simplify unbrewed file whitelists

Browse Source 
Only the keys of the hashes are used, so we can just use arrays and
comments instead.
This commit is contained in:
Jack Nagel 2014-09-24 15:08:18 -05:00
parent f9d5dbb19b
commit 892d7dc130
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,9 +108,8 @@ def __check_stray_files(dir, pattern, white_list, message)
Dir[pattern].select { |f| File.file?(f) && !File.symlink?(f) } Dir[pattern].select { |f| File.file?(f) && !File.symlink?(f) }
} }
keys = white_list.keys
bad = files.reject { |file| bad = files.reject { |file|
keys.any? { |pat| File.fnmatch?(pat, file) } white_list.any? { |pat| File.fnmatch?(pat, file) }
} }
bad.map! { |file| File.join(dir, file) } bad.map! { |file| File.join(dir, file) }
@ -121,12 +120,12 @@ end
def check_for_stray_dylibs def check_for_stray_dylibs
# Dylibs which are generally OK should be added to this list, # Dylibs which are generally OK should be added to this list,
# with a short description of the software they come with. # with a short description of the software they come with.
white_list = { white_list = [
"libfuse.2.dylib" => "MacFuse", "libfuse.2.dylib", # MacFuse
"libfuse_ino64.2.dylib" => "MacFuse", "libfuse_ino64.2.dylib", # MacFuse
"libosxfuse_i32.2.dylib" => "OSXFuse", "libosxfuse_i32.2.dylib", # OSXFuse
"libosxfuse_i64.2.dylib" => "OSXFuse", "libosxfuse_i64.2.dylib", # OSXFuse
} ]
__check_stray_files "/usr/local/lib", "*.dylib", white_list, <<-EOS.undent __check_stray_files "/usr/local/lib", "*.dylib", white_list, <<-EOS.undent
Unbrewed dylibs were found in /usr/local/lib. Unbrewed dylibs were found in /usr/local/lib.
@ -140,10 +139,10 @@ end
def check_for_stray_static_libs def check_for_stray_static_libs
# Static libs which are generally OK should be added to this list, # Static libs which are generally OK should be added to this list,
# with a short description of the software they come with. # with a short description of the software they come with.
white_list = { white_list = [
"libsecurity_agent_client.a" => "OS X 10.8.2 Supplemental Update", "libsecurity_agent_client.a", # OS X 10.8.2 Supplemental Update
"libsecurity_agent_server.a" => "OS X 10.8.2 Supplemental Update" "libsecurity_agent_server.a", # OS X 10.8.2 Supplemental Update
} ]
__check_stray_files "/usr/local/lib", "*.a", white_list, <<-EOS.undent __check_stray_files "/usr/local/lib", "*.a", white_list, <<-EOS.undent
Unbrewed static libraries were found in /usr/local/lib. Unbrewed static libraries were found in /usr/local/lib.
@ -157,9 +156,9 @@ end
def check_for_stray_pcs def check_for_stray_pcs
# Package-config files which are generally OK should be added to this list, # Package-config files which are generally OK should be added to this list,
# with a short description of the software they come with. # with a short description of the software they come with.
white_list = { white_list = [
"osxfuse.pc" => "OSXFuse", "osxfuse.pc", # OSXFuse
} ]
__check_stray_files "/usr/local/lib/pkgconfig", "*.pc", white_list, <<-EOS.undent __check_stray_files "/usr/local/lib/pkgconfig", "*.pc", white_list, <<-EOS.undent
Unbrewed .pc files were found in /usr/local/lib/pkgconfig. Unbrewed .pc files were found in /usr/local/lib/pkgconfig.
@ -171,12 +170,12 @@ def check_for_stray_pcs
end end
def check_for_stray_las def check_for_stray_las
white_list = { white_list = [
"libfuse.la" => "MacFuse", "libfuse.la", # MacFuse
"libfuse_ino64.la" => "MacFuse", "libfuse_ino64.la", # MacFuse
"libosxfuse_i32.la" => "OSXFuse", "libosxfuse_i32.la", # OSXFuse
"libosxfuse_i64.la" => "OSXFuse", "libosxfuse_i64.la", # OSXFuse
} ]
__check_stray_files "/usr/local/lib", "*.la", white_list, <<-EOS.undent __check_stray_files "/usr/local/lib", "*.la", white_list, <<-EOS.undent
Unbrewed .la files were found in /usr/local/lib. Unbrewed .la files were found in /usr/local/lib.
@ -188,9 +187,9 @@ def check_for_stray_las
end end
def check_for_stray_headers def check_for_stray_headers
white_list = { white_list = [
"osxfuse/*" => "OSXFuse", "osxfuse/*", # OSXFuse
} ]
__check_stray_files "/usr/local/include", "**/*.h", white_list, <<-EOS.undent __check_stray_files "/usr/local/include", "**/*.h", white_list, <<-EOS.undent
Unbrewed header files were found in /usr/local/include. Unbrewed header files were found in /usr/local/include.