Skip to content

Commit

Permalink
When using zstd, use tar flags that are compatible with both gnu tar …
Browse files Browse the repository at this point in the history
…and bsdtar (#2009)
  • Loading branch information
jordansissel committed Dec 8, 2024
1 parent e66a359 commit c326b39
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/fpm/package/deb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down Expand Up @@ -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 = ""
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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 = []
Expand Down

0 comments on commit c326b39

Please sign in to comment.