themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove installers sdk archive when archive fails

Browse source 
This will allow the next run to redownload the file.
This commit is contained in:
Luke 2022-11-24 16:19:39 +10:00
parent 403677fad2
commit e561158699
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
TShockInstaller/Program.cs
View file

@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
using ICSharpCode.SharpZipLib.GZip; using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar; using ICSharpCode.SharpZipLib.Tar;
Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine($"TShock Installer {typeof(Program).Assembly.GetName().Version}."); Console.WriteLine($"TShock Installer {typeof(Program).Assembly.GetName().Version}.");
// reference: https://github.com/dotnet/install-scripts/blob/main/src/dotnet-install.sh // reference: https://github.com/dotnet/install-scripts/blob/main/src/dotnet-install.sh
@ -65,23 +66,37 @@ var tshock_path = "TShock.Server" + (is_targz ? "" : ".exe");
if (!File.Exists(dotnet_path)) if (!File.Exists(dotnet_path))
{ {
Console.WriteLine("Extracting to ./dotnet/"); try
if (is_targz)
{ {
using var srm_dotnet_file = File.OpenRead(filename); Console.WriteLine("Extracting to ./dotnet/");
using var srm_gzip = new GZipInputStream(srm_dotnet_file); if (is_targz)
{
using var srm_dotnet_file = File.OpenRead(filename);
using var srm_gzip = new GZipInputStream(srm_dotnet_file);
using var tar_archive = TarArchive.CreateInputTarArchive(srm_gzip, System.Text.Encoding.UTF8); using var tar_archive = TarArchive.CreateInputTarArchive(srm_gzip, System.Text.Encoding.UTF8);
tar_archive.ExtractContents("dotnet"); tar_archive.ExtractContents("dotnet");
[DllImport("libc", SetLastError = true)] [DllImport("libc", SetLastError = true)]
static extern int chmod(string pathname, int mode); static extern int chmod(string pathname, int mode);
chmod(dotnet_path, 755); chmod(dotnet_path, 755);
}
else
{
ZipFile.ExtractToDirectory(filename, "dotnet");
}
} }
else catch (Exception ex)
{ {
ZipFile.ExtractToDirectory(filename, "dotnet"); Console.ForegroundColor = ConsoleColor.Red;
Console.Error.WriteLine($"Failed to extract {filename}. The archive will be removed. Restart the installer to begin the download again.");
Console.Error.WriteLine(ex);
if (File.Exists(filename))
File.Delete(filename);
return;
} }
} }
else else