From 662e7fc4f0435423b76b5e7f57a21cbc58ecd1b7 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Mon, 18 Jul 2022 09:12:07 +0000 Subject: [PATCH 1/2] Move zstd from flags to equivalent aliases --- src/internal/tar.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/internal/tar.ts b/src/internal/tar.ts index c809191..1f63da5 100644 --- a/src/internal/tar.ts +++ b/src/internal/tar.ts @@ -67,9 +67,9 @@ export async function extractTar( function getCompressionProgram(): string[] { switch (compressionMethod) { case CompressionMethod.Zstd: - return ['--use-compress-program', 'zstd -d --long=30'] + return ['--use-compress-program', 'unzstd --long=30'] case CompressionMethod.ZstdWithoutLong: - return ['--use-compress-program', 'zstd -d'] + return ['--use-compress-program', 'unzstd'] default: return ['-z'] } @@ -106,9 +106,9 @@ export async function createTar( function getCompressionProgram(): string[] { switch (compressionMethod) { case CompressionMethod.Zstd: - return ['--use-compress-program', 'zstd -T0 --long=30'] + return ['--use-compress-program', 'zstdmt --long=30'] case CompressionMethod.ZstdWithoutLong: - return ['--use-compress-program', 'zstd -T0'] + return ['--use-compress-program', 'zstdmt'] default: return ['-z'] } @@ -140,9 +140,9 @@ export async function listTar( function getCompressionProgram(): string[] { switch (compressionMethod) { case CompressionMethod.Zstd: - return ['--use-compress-program', 'zstd -d --long=30'] + return ['--use-compress-program', 'unzstd --long=30'] case CompressionMethod.ZstdWithoutLong: - return ['--use-compress-program', 'zstd -d'] + return ['--use-compress-program', 'unzstd'] default: return ['-z'] } From 601a55b62d8487a77d16988ea727d265a418e501 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Mon, 18 Jul 2022 12:48:19 +0000 Subject: [PATCH 2/2] Fix tar test cases --- __tests__/tar.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/__tests__/tar.test.ts b/__tests__/tar.test.ts index 4aed759..b05c67e 100644 --- a/__tests__/tar.test.ts +++ b/__tests__/tar.test.ts @@ -50,7 +50,7 @@ test('zstd extract tar', async () => { `"${defaultTarPath}"`, [ '--use-compress-program', - 'zstd -d --long=30', + 'unzstd --long=30', '-xf', IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, '-P', @@ -140,7 +140,7 @@ test('zstd create tar', async () => { [ '--posix', '--use-compress-program', - 'zstd -T0 --long=30', + 'zstdmt --long=30', '-cf', IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd, '--exclude', @@ -210,7 +210,7 @@ test('zstd list tar', async () => { `"${defaultTarPath}"`, [ '--use-compress-program', - 'zstd -d --long=30', + 'unzstd --long=30', '-tf', IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, '-P' @@ -235,7 +235,7 @@ test('zstdWithoutLong list tar', async () => { `"${defaultTarPath}"`, [ '--use-compress-program', - 'zstd -d', + 'unzstd', '-tf', IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, '-P'