Bug in .tat.gz unpacking

Author: Juan Segura

ZXBSInstaller.Log/ServiceLayer.cs

@@ -1,7 +1,9 @@
 using Microsoft.VisualBasic;
 using System;
 using System.Diagnostics;
+using System.Formats.Tar;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using System.Reflection.Metadata.Ecma335;
 using System.Runtime;
@@ -822,7 +824,7 @@ private static ExternalTools_Version GetBorielBasicVersion(string exePath)
                 var v = GetVersionNumber(version);
                 int number = v.Item1;
                 int beta = v.Item2;
-                
+
                 return new ExternalTools_Version()
                 {
                     DownloadUrl = "",
@@ -990,7 +992,7 @@ public static void DownloadAndInstallTool(ExternalTool tool, ExternalTools_Versi
                 // Extract file
                 step = $"Installing {tool.Name}";
                 UpdateStatus($"Installing {tool.Name} version {version.Version}...", 50);
-                System.IO.Compression.ZipFile.ExtractToDirectory(tempFile, installationPath, true);
+                ExtractFile(tempFile, installationPath);
 
                 // Set ZXBS Options
                 step = "Set ZX Basic Studio options";
@@ -1012,6 +1014,73 @@ public static void DownloadAndInstallTool(ExternalTool tool, ExternalTools_Versi
         }
 
 
+        private static void ExtractFile(string archive, string destination)
+        {
+            if (archive.ToLower().EndsWith(".zip"))
+            {
+                System.IO.Compression.ZipFile.ExtractToDirectory(archive, destination, true);
+            }
+            else if (CurrentOperatingSystem != OperatingSystems.Windows)
+            {
+                Directory.CreateDirectory(destination);
+
+                var psi = new ProcessStartInfo
+                {
+                    FileName = "tar",
+                    Arguments = $"-xzf \"{archive}\" -C \"{destination}\"",
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true
+                };
+
+                using var process = Process.Start(psi)!;
+
+                string stdout = process.StandardOutput.ReadToEnd();
+                string stderr = process.StandardError.ReadToEnd();
+
+                process.WaitForExit();
+
+                if (process.ExitCode != 0)
+                {
+                    ShowMessage($"Error unpacking file {archive}\r\n{stderr}");
+                    return;
+                }
+            }
+            //if (archive.ToLower().EndsWith(".tar.gz"))
+            //{
+            //    Directory.CreateDirectory(destination);
+
+            //    using var fileStream = File.OpenRead(archive);
+            //    using var gzipStream = new GZipStream(fileStream, CompressionMode.Decompress);
+            //    using var tarReader = new TarReader(gzipStream);
+
+            //    TarEntry? entry;
+            //    while ((entry = tarReader.GetNextEntry()) != null)
+            //    {
+            //        string fullPath = Path.Combine(destination, entry.Name);
+
+            //        if (entry.EntryType == TarEntryType.Directory)
+            //        {
+            //            Directory.CreateDirectory(fullPath);
+            //        }
+            //        else
+            //        {
+            //            Directory.CreateDirectory(Path.GetDirectoryName(fullPath)!);
+            //            if (entry.Length == 0)
+            //            {
+            //                File.WriteAllBytes(fullPath, new byte[0]);
+            //            }
+            //            else
+            //            {
+            //                entry.DataStream!.CopyTo(File.Create(fullPath));
+            //            }
+            //        }
+            //    }
+            //}
+        }
+
+
         private static void SetZXBSConfig()
         {
             try
@@ -1049,7 +1118,7 @@ private static void SetZXBSConfig()
                         {
                             exe += ".exe";
                         }
-                        var dir = Path.Combine(GeneralConfig.BasePath, "zxbasic", exe).Replace("\\","\\\\");
+                        var dir = Path.Combine(GeneralConfig.BasePath, "zxbasic", exe).Replace("\\", "\\\\");
                         line = $"  \"ZxbasmPath\": \"{dir}\",";
                     }
                     else if (line.Contains("ZxbcPath"))

ZXBSInstaller/ZXBSInstaller.csproj

@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
-    <Version>0.0.1.2</Version>
+    <Version>0.0.1.5</Version>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="zxbs.ico" />