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

Merge pull request #11321 from Bo98/gzip

Browse Source 
dev-cmd/bottle: make gzip creation consistent across platforms
This commit is contained in:
Bo Anderson 2021-05-12 14:58:43 +01:00 committed by GitHub
commit a92c194bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -10,6 +10,7 @@ require "cli/parser"
require "utils/inreplace" require "utils/inreplace"
require "erb" require "erb"
require "archive" require "archive"
require "zlib"
BOTTLE_ERB = <<-EOS BOTTLE_ERB = <<-EOS
bottle do bottle do
@ -29,6 +30,7 @@ BOTTLE_ERB = <<-EOS
EOS EOS
MAXIMUM_STRING_MATCHES = 100 MAXIMUM_STRING_MATCHES = 100
GZIP_BUFFER_SIZE = 64 * 1024
module Homebrew module Homebrew
extend T::Sig extend T::Sig
@ -440,9 +442,14 @@ module Homebrew
mv tar_path, relocatable_tar_path mv tar_path, relocatable_tar_path
# Use gzip, faster to compress than bzip2, faster to uncompress than bzip2 # Use gzip, faster to compress than bzip2, faster to uncompress than bzip2
# or an uncompressed tarball (and more bandwidth friendly). # or an uncompressed tarball (and more bandwidth friendly).
safe_system "gzip", "-f", relocatable_tar_path gz = Zlib::GzipWriter.open(bottle_path)
gz.mtime = tab.source_modified_time
gz.orig_name = relocatable_tar_path
File.open(relocatable_tar_path, "rb") do |tarfile|
gz.write(tarfile.read(GZIP_BUFFER_SIZE)) until tarfile.eof?
end
gz.close
sudo_purge sudo_purge
mv "#{relocatable_tar_path}.gz", bottle_path
end end
ohai "Detecting if #{local_filename} is relocatable..." if bottle_path.size > 1 * 1024 * 1024 ohai "Detecting if #{local_filename} is relocatable..." if bottle_path.size > 1 * 1024 * 1024