Use gzip instead of bzip2

zakird · May 27, 2019 · f2d79ae · f2d79ae
1 parent 4e225b9
commit f2d79ae
Show file tree

Hide file tree

Showing 33 changed files with 13 additions and 14 deletions.
diff --git a/.docker/Dockerfile-centos_6 b/.docker/Dockerfile-centos_6
@@ -1,5 +1,5 @@
 FROM centos:6
 
-RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext bzip2
+RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-centos_7 b/.docker/Dockerfile-centos_7
@@ -1,5 +1,5 @@
 FROM centos:7
 
-RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext bzip2
+RUN yum install -y ruby libjpeg-turbo libpng libXrender fontconfig libXext
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-debian_8 b/.docker/Dockerfile-debian_8
@@ -3,6 +3,6 @@ FROM debian:8
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y ruby libjpeg62-turbo libpng12-0 libxrender1 libfontconfig1 libxext6 bzip2
+RUN apt-get install -y ruby libjpeg62-turbo libpng12-0 libxrender1 libfontconfig1 libxext6
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-debian_9 b/.docker/Dockerfile-debian_9
@@ -3,6 +3,6 @@ FROM debian:9
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6 bzip2
+RUN apt-get install -y ruby libjpeg62-turbo libpng16-16 libxrender1 libfontconfig1 libxext6
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-ubuntu_14.04 b/.docker/Dockerfile-ubuntu_14.04
@@ -3,6 +3,6 @@ FROM ubuntu:14.04
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1 bzip2
+RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-ubuntu_16.04 b/.docker/Dockerfile-ubuntu_16.04
@@ -3,6 +3,6 @@ FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1 bzip2
+RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/.docker/Dockerfile-ubuntu_18.04 b/.docker/Dockerfile-ubuntu_18.04
@@ -3,6 +3,6 @@ FROM ubuntu:18.04
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1 bzip2
+RUN apt-get install -y ruby libjpeg8 libxrender1 libfontconfig1
 
 CMD /root/wkhtmltopdf_binary_gem/bin/wkhtmltopdf --version
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ macOS
 
 ## Compression
 
-Binaries should be compressed with `bzip2 -9` after extracting. The matching binary will be extracted on first
+Binaries should be compressed with `gzip --best` after extracting. The matching binary will be extracted on first
 execution of `bin/wkhtmltopdf`.
 
 ## Testing with Docker

diff --git a/bin/wkhtmltopdf b/bin/wkhtmltopdf
@@ -8,6 +8,7 @@
 # of the License at http://www.apache.org/licenses/LICENSE-2.0
 
 require 'rbconfig'
+require 'zlib'
 
 suffix = case RbConfig::CONFIG['host_os']
          when /linux/
@@ -29,12 +30,10 @@ suffix = case RbConfig::CONFIG['host_os']
 
 binary = "#{__FILE__}_#{suffix}"
 
-if File.exist?("#{binary}.bz2") && !File.exist?(binary)
-  # There was an error on macOS when a hard link to the archive exists (could be
-  # Time Machine). Even with `--keep` it states: 'Input file has 1 other link'.
-  # Using `--force` fixes this.
-  system("bzip2 --decompress --keep --force #{binary}.bz2") ||
-    raise("Decompression of #{binary}.bz2 failed. Do you have bzip2 installed?")
+if File.exist?("#{binary}.gz") && !File.exist?(binary)
+  File.open binary, 'wb', 0o755 do |file|
+    Zlib::GzipReader.open("#{binary}.gz") { |gzip| file << gzip.read }
+  end
 end
 
 unless File.exist? binary

diff --git a/bin/wkhtmltopdf_centos_6_amd64.bz2 b/bin/wkhtmltopdf_centos_6_amd64.bz2
diff --git a/bin/wkhtmltopdf_debian_8_i386.bz2 → bin/wkhtmltopdf_centos_6_amd64.gz b/bin/wkhtmltopdf_debian_8_i386.bz2 → bin/wkhtmltopdf_centos_6_amd64.gz
diff --git a/bin/wkhtmltopdf_centos_6_i386.bz2 b/bin/wkhtmltopdf_centos_6_i386.bz2
diff --git a/bin/wkhtmltopdf_centos_6_i386.gz b/bin/wkhtmltopdf_centos_6_i386.gz
diff --git a/bin/wkhtmltopdf_centos_7_amd64.bz2 b/bin/wkhtmltopdf_centos_7_amd64.bz2
diff --git a/bin/wkhtmltopdf_debian_9_amd64.bz2 → bin/wkhtmltopdf_centos_7_amd64.gz b/bin/wkhtmltopdf_debian_9_amd64.bz2 → bin/wkhtmltopdf_centos_7_amd64.gz
diff --git a/bin/wkhtmltopdf_centos_7_i386.bz2 b/bin/wkhtmltopdf_centos_7_i386.bz2
diff --git a/bin/wkhtmltopdf_ubuntu_18.04_amd64.bz2 → bin/wkhtmltopdf_centos_7_i386.gz b/bin/wkhtmltopdf_ubuntu_18.04_amd64.bz2 → bin/wkhtmltopdf_centos_7_i386.gz
diff --git a/bin/wkhtmltopdf_debian_8_amd64.bz2 b/bin/wkhtmltopdf_debian_8_amd64.bz2
diff --git a/bin/wkhtmltopdf_debian_9_i386.bz2 → bin/wkhtmltopdf_debian_8_amd64.gz b/bin/wkhtmltopdf_debian_9_i386.bz2 → bin/wkhtmltopdf_debian_8_amd64.gz
diff --git a/bin/wkhtmltopdf_ubuntu_18.04_i386.bz2 → bin/wkhtmltopdf_debian_8_i386.gz b/bin/wkhtmltopdf_ubuntu_18.04_i386.bz2 → bin/wkhtmltopdf_debian_8_i386.gz
diff --git a/bin/wkhtmltopdf_debian_9_amd64.gz b/bin/wkhtmltopdf_debian_9_amd64.gz
diff --git a/bin/wkhtmltopdf_debian_9_i386.gz b/bin/wkhtmltopdf_debian_9_i386.gz
diff --git a/bin/wkhtmltopdf_macos_carbon.gz b/bin/wkhtmltopdf_macos_carbon.gz
diff --git a/bin/wkhtmltopdf_macos_cocoa.gz b/bin/wkhtmltopdf_macos_cocoa.gz
diff --git a/bin/wkhtmltopdf_ubuntu_14.04_amd64.bz2 b/bin/wkhtmltopdf_ubuntu_14.04_amd64.bz2
diff --git a/bin/wkhtmltopdf_macos_carbon.bz2 → bin/wkhtmltopdf_ubuntu_14.04_amd64.gz b/bin/wkhtmltopdf_macos_carbon.bz2 → bin/wkhtmltopdf_ubuntu_14.04_amd64.gz
diff --git a/bin/wkhtmltopdf_ubuntu_14.04_i386.bz2 b/bin/wkhtmltopdf_ubuntu_14.04_i386.bz2
diff --git a/bin/wkhtmltopdf_ubuntu_16.04_i386.bz2 → bin/wkhtmltopdf_ubuntu_14.04_i386.gz b/bin/wkhtmltopdf_ubuntu_16.04_i386.bz2 → bin/wkhtmltopdf_ubuntu_14.04_i386.gz
diff --git a/bin/wkhtmltopdf_ubuntu_16.04_amd64.bz2 b/bin/wkhtmltopdf_ubuntu_16.04_amd64.bz2
diff --git a/bin/wkhtmltopdf_macos_cocoa.bz2 → bin/wkhtmltopdf_ubuntu_16.04_amd64.gz b/bin/wkhtmltopdf_macos_cocoa.bz2 → bin/wkhtmltopdf_ubuntu_16.04_amd64.gz
diff --git a/bin/wkhtmltopdf_ubuntu_16.04_i386.gz b/bin/wkhtmltopdf_ubuntu_16.04_i386.gz
diff --git a/bin/wkhtmltopdf_ubuntu_18.04_amd64.gz b/bin/wkhtmltopdf_ubuntu_18.04_amd64.gz
diff --git a/bin/wkhtmltopdf_ubuntu_18.04_i386.gz b/bin/wkhtmltopdf_ubuntu_18.04_i386.gz