Skip to content

fix missing -z flag on tar when unpacking on non windows platforms #69

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

Merged
merged 2 commits into from
May 28, 2025
Merged

fix missing -z flag on tar when unpacking on non windows platforms #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb6bb0
fix missing -z flag on tar when unpacking on non windows platforms
Mpdreamz May 28, 2025
635546c
add .NET 6.x to install on ci
Mpdreamz May 28, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
- uses: actions/setup-dotnet@v3
with:
global-json-file: global.json
dotnet-version: |
6.x
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

Expand Down
18 changes: 10 additions & 8 deletions src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,23 @@ protected static void Extract(string file, string toFolder)

private static void ExtractTar(string file, string toFolder)
{
using (var inStream = File.OpenRead(file))
using (var tarArchive = TarArchive.CreateInputTarArchive(inStream))
tarArchive.ExtractContents(toFolder);
using var inStream = File.OpenRead(file);
using var tarArchive = TarArchive.CreateInputTarArchive(inStream);
tarArchive.ExtractContents(toFolder);
}

private static void ExtractTarGz(string file, string toFolder)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
using (var inStream = File.OpenRead(file))
using (var gzipStream = new GZipInputStream(inStream))
using (var tarArchive = TarArchive.CreateInputTarArchive(gzipStream))
tarArchive.ExtractContents(toFolder);
{
using var inStream = File.OpenRead(file);
using var gzipStream = new GZipInputStream(inStream);
using var tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
tarArchive.ExtractContents(toFolder);
}
else
//SharpZipLib loses permissions when untarring
Proc.Exec("tar", "-xvf", file, "-C", toFolder);
Proc.Exec("tar", "-zxvf", file, "-C", toFolder);
}

private static void ExtractZip(string file, string toFolder) =>
Expand Down