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

keg_relocate: fix for multiline /usr/bin/file output

Browse Source
This commit is contained in:
Josh Hagins 2016-10-12 11:37:34 -04:00
parent dc4ab8fd26
commit 24c2d0b3c2
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.
# http://bugs.gw.com/view.php?id=292
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.directory?
next true if Metafiles::EXTENSIONS.include?(pn.extname)
@ -82,11 +82,14 @@ class Keg
end
false
}
output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --brief",
stdin_data: files.join("\0"))
output.each_line.with_index do |line, i|
next unless line.include?("text")
text_files << files[i]
output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --print0",
stdin_data: files.to_a.join("\0"))
output.each_line do |line|
path, info = line.split("\0")
next unless info.to_s.include?("text")
path = Pathname.new(path)
next unless files.include?(path)
text_files << path
end
end