Skip to content

Commit c326b39

Browse files
committed
When using zstd, use tar flags that are compatible with both gnu tar and bsdtar (#2009)
1 parent e66a359 commit c326b39

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
@@ -334,7 +334,7 @@ def extract_info(package)
334334
compression = "-J"
335335
when "zst"
336336
controltar = "control.tar.zst"
337-
compression = "-I zstd"
337+
compression = "--use-compress-program 'zstd -d'"
338338
when 'tar'
339339
controltar = "control.tar"
340340
compression = ""
@@ -459,7 +459,7 @@ def extract_files(package)
459459
compression = "-J"
460460
when "zst"
461461
datatar = "data.tar.zst"
462-
compression = "-I zstd"
462+
compression = "--use-compress-program 'zstd -d'"
463463
when 'tar'
464464
datatar = "data.tar"
465465
compression = ""
@@ -671,7 +671,7 @@ def output(output_path)
671671
when "zst"
672672
datatar = build_path("data.tar.zst")
673673
controltar = build_path("control.tar.zst")
674-
compression_flags = ["-I zstd"]
674+
compression_flags = ["--use-compress-program", "zstd"]
675675
when "none"
676676
datatar = build_path("data.tar")
677677
controltar = build_path("control.tar")
@@ -961,7 +961,7 @@ def write_control_tarball
961961
compression_flags = ["-J"]
962962
when "zst"
963963
controltar = "control.tar.zst"
964-
compression_flags = ["-I zstd"]
964+
compression_flags = ["--use-compress-program", "zstd"]
965965
when "none"
966966
controltar = "control.tar"
967967
compression_flags = []

0 commit comments

Comments
 (0)