Skip to content

Commit f714f4b

Browse files
authored
Merge pull request #2084 from /pull/2009
When using zstd, use tar flags that are compatible with both gnu tar and bsdtar (#2009)
2 parents 28fea4c + b2f2fc6 commit f714f4b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/fpm/package/deb.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def extract_info(package)
355355
compression = "-J"
356356
when "zst"
357357
controltar = "control.tar.zst"
358-
compression = "-I zstd"
358+
compression = "--use-compress-program 'zstd -d'"
359359
when 'tar'
360360
controltar = "control.tar"
361361
compression = ""
@@ -480,7 +480,7 @@ def extract_files(package)
480480
compression = "-J"
481481
when "zst"
482482
datatar = "data.tar.zst"
483-
compression = "-I zstd"
483+
compression = "--use-compress-program 'zstd -d'"
484484
when 'tar'
485485
datatar = "data.tar"
486486
compression = ""
@@ -698,7 +698,7 @@ def output(output_path)
698698
when "zst"
699699
datatar = build_path("data.tar.zst")
700700
controltar = build_path("control.tar.zst")
701-
compression_flags = ["-I zstd"]
701+
compression_flags = ["--use-compress-program", "zstd"]
702702
compressor_options = {"ZSTD_CLEVEL" => "-#{self.attributes[:deb_compression_level] || 3}"}
703703
when "none"
704704
datatar = build_path("data.tar")
@@ -1018,7 +1018,7 @@ def write_control_tarball
10181018
compressor_options = {"XZ_OPT" => "-#{self.attributes[:deb_compression_level] || 3}"}
10191019
when "zst"
10201020
controltar = "control.tar.zst"
1021-
compression_flags = ["-I zstd"]
1021+
compression_flags = ["--use-compress-program", "zstd"]
10221022
compressor_options = {"ZSTD_CLEVEL" => "-#{self.attributes[:deb_compression_level] || 3}"}
10231023
when "none"
10241024
controltar = "control.tar"

0 commit comments

Comments
 (0)