Skip to content

Commit 4fd3d13

Browse files
authored
fix missing -z flag on tar when unpacking on non windows platforms (#69)
* fix missing -z flag on tar when unpacking on non windows platforms * add .NET 6.x to install on ci
1 parent 34d6e3d commit 4fd3d13

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
- uses: actions/setup-dotnet@v3
3131
with:
3232
global-json-file: global.json
33+
dotnet-version: |
34+
6.x
3335
env:
3436
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
3537

src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,21 +227,23 @@ protected static void Extract(string file, string toFolder)
227227

228228
private static void ExtractTar(string file, string toFolder)
229229
{
230-
using (var inStream = File.OpenRead(file))
231-
using (var tarArchive = TarArchive.CreateInputTarArchive(inStream))
232-
tarArchive.ExtractContents(toFolder);
230+
using var inStream = File.OpenRead(file);
231+
using var tarArchive = TarArchive.CreateInputTarArchive(inStream);
232+
tarArchive.ExtractContents(toFolder);
233233
}
234234

235235
private static void ExtractTarGz(string file, string toFolder)
236236
{
237237
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
238-
using (var inStream = File.OpenRead(file))
239-
using (var gzipStream = new GZipInputStream(inStream))
240-
using (var tarArchive = TarArchive.CreateInputTarArchive(gzipStream))
241-
tarArchive.ExtractContents(toFolder);
238+
{
239+
using var inStream = File.OpenRead(file);
240+
using var gzipStream = new GZipInputStream(inStream);
241+
using var tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
242+
tarArchive.ExtractContents(toFolder);
243+
}
242244
else
243245
//SharpZipLib loses permissions when untarring
244-
Proc.Exec("tar", "-xvf", file, "-C", toFolder);
246+
Proc.Exec("tar", "-zxvf", file, "-C", toFolder);
245247
}
246248

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

0 commit comments

Comments
 (0)