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

Use zipinfo instead of unzip -l.

Browse Source
This commit is contained in:
Markus Reiter 2018-07-12 22:14:04 +02:00
parent f92e3086ac
commit d3534c1cc2
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/unpack_strategy.rb
View File

@ -92,17 +92,8 @@ class JarUnpackStrategy < UncompressedUnpackStrategy
return false unless ZipUnpackStrategy.can_extract?(path: path, magic_number: magic_number) return false unless ZipUnpackStrategy.can_extract?(path: path, magic_number: magic_number)
# Check further if the ZIP is a JAR/WAR. # Check further if the ZIP is a JAR/WAR.
Open3.popen3("unzip", "-l", path) do |stdin, stdout, stderr, wait_thr| out, _, status = Open3.capture3("zipinfo", "-1", path)
stdin.close_write status.success? && out.split("\n").include?("META-INF/MANIFEST.MF")
stderr.close_read
begin
return stdout.each_line.any? { |l| l.match?(%r{\s+META-INF/MANIFEST.MF$}) }
ensure
stdout.close_read
wait_thr.kill
end
end
end end
end end