From c326b39d95d63b00dd07a685dc94e6a2c1bd92d5 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Sat, 7 Dec 2024 22:40:27 -0800 Subject: [PATCH] When using zstd, use tar flags that are compatible with both gnu tar and bsdtar (#2009) --- lib/fpm/package/deb.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb index a29d1948e..02825594c 100644 --- a/lib/fpm/package/deb.rb +++ b/lib/fpm/package/deb.rb @@ -334,7 +334,7 @@ def extract_info(package) compression = "-J" when "zst" controltar = "control.tar.zst" - compression = "-I zstd" + compression = "--use-compress-program 'zstd -d'" when 'tar' controltar = "control.tar" compression = "" @@ -459,7 +459,7 @@ def extract_files(package) compression = "-J" when "zst" datatar = "data.tar.zst" - compression = "-I zstd" + compression = "--use-compress-program 'zstd -d'" when 'tar' datatar = "data.tar" compression = "" @@ -671,7 +671,7 @@ def output(output_path) when "zst" datatar = build_path("data.tar.zst") controltar = build_path("control.tar.zst") - compression_flags = ["-I zstd"] + compression_flags = ["--use-compress-program", "zstd"] when "none" datatar = build_path("data.tar") controltar = build_path("control.tar") @@ -961,7 +961,7 @@ def write_control_tarball compression_flags = ["-J"] when "zst" controltar = "control.tar.zst" - compression_flags = ["-I zstd"] + compression_flags = ["--use-compress-program", "zstd"] when "none" controltar = "control.tar" compression_flags = []