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

Merge pull request #1273 from jawshooah/fix-relocate

Browse Source 
keg_relocate: fix for multiline /usr/bin/file output
This commit is contained in:
Mike McQuaid 2016-10-12 19:08:10 +01:00 committed by GitHub
commit 8efb585684
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/keg_relocate.rb
View File

@ -72,7 +72,7 @@ class Keg
# file with that fix is only available in macOS Sierra. # file with that fix is only available in macOS Sierra.
# http://bugs.gw.com/view.php?id=292 # http://bugs.gw.com/view.php?id=292
with_custom_locale("C") do with_custom_locale("C") do
files = path.find.reject { |pn| files = Set.new path.find.reject { |pn|
next true if pn.symlink? next true if pn.symlink?
next true if pn.directory? next true if pn.directory?
next true if Metafiles::EXTENSIONS.include?(pn.extname) next true if Metafiles::EXTENSIONS.include?(pn.extname)
@ -82,11 +82,14 @@ class Keg
end end
false false
} }
output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --brief", output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --print0",
stdin_data: files.join("\0")) stdin_data: files.to_a.join("\0"))
output.each_line.with_index do |line, i| output.each_line do |line|
next unless line.include?("text") path, info = line.split("\0")
text_files << files[i] next unless info.to_s.include?("text")
path = Pathname.new(path)
next unless files.include?(path)
text_files << path
end end
end end