Skip to content

Separate flags from paths in decompression tool invocations #3224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Separate flags from paths in decompression tool invocations #3224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions crates/cli/src/decompress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,14 +488,14 @@ fn try_resolve_binary<P: AsRef<Path>>(
}

fn default_decompression_commands() -> Vec<DecompressionCommand> {
const ARGS_GZIP: &[&str] = &["gzip", "-d", "-c"];
const ARGS_BZIP: &[&str] = &["bzip2", "-d", "-c"];
const ARGS_XZ: &[&str] = &["xz", "-d", "-c"];
const ARGS_LZ4: &[&str] = &["lz4", "-d", "-c"];
const ARGS_LZMA: &[&str] = &["xz", "--format=lzma", "-d", "-c"];
const ARGS_BROTLI: &[&str] = &["brotli", "-d", "-c"];
const ARGS_ZSTD: &[&str] = &["zstd", "-q", "-d", "-c"];
const ARGS_UNCOMPRESS: &[&str] = &["uncompress", "-c"];
const ARGS_GZIP: &[&str] = &["gzip", "-d", "-c", "--"];
const ARGS_BZIP: &[&str] = &["bzip2", "-d", "-c", "--"];
const ARGS_XZ: &[&str] = &["xz", "-d", "-c", "--"];
const ARGS_LZ4: &[&str] = &["lz4", "-d", "-c", "--"];
const ARGS_LZMA: &[&str] = &["xz", "--format=lzma", "-d", "-c", "--"];
const ARGS_BROTLI: &[&str] = &["brotli", "-d", "-c", "--"];
const ARGS_ZSTD: &[&str] = &["zstd", "-q", "-d", "-c", "--"];
const ARGS_UNCOMPRESS: &[&str] = &["uncompress", "-c", "--"];

fn add(glob: &str, args: &[&str], cmds: &mut Vec<DecompressionCommand>) {
let bin = match resolve_binary(Path::new(args[0])) {
Expand Down