Merge remote-tracking branch 'deathcradle/tshock-installer' into general-devel

2022-11-27 23:46:27 -08:00 · 2022-11-27 23:46:27 -08:00 · faed064b50
commit faed064b50
parent d0262656df c600966a75
4 changed files with 172 additions and 0 deletions
--- a/.github/workflows/ci-otapi3.yml
+++ b/.github/workflows/ci-otapi3.yml
@ -36,6 +36,11 @@ jobs:
      - name: Install msgfmt
        run: sudo apt-get install -y gettext

+      - name: Produce installer
+        run: |
+            cd TShockInstaller
+            dotnet publish -r ${{ matrix.arch }} -f net6.0 -c Release -p:PublishSingleFile=true --self-contained true
+
      - name: Produce build
        run: |
            cd TShockLauncher
@ -46,6 +51,10 @@ jobs:
        run: |
            chmod +x TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/TShock.Server

+      - name: Copy installer
+        run: |
+            cp TShockInstaller/bin/Release/net6.0/${{ matrix.arch }}/publish/* TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/
+
      # preserve file perms: https://github.com/actions/upload-artifact#maintaining-file-permissions-and-case-sensitive-files
      - name: Tarball artifact (non-Windows)
        if: ${{ matrix.arch != 'win-x64' }}
--- a/TShock.sln
+++ b/TShock.sln
@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TShockLauncher", "TShockLau
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TShockLauncher.Tests", "TShockLauncher.Tests\TShockLauncher.Tests.csproj", "{90AB47F3-8220-48FC-BDAB-D6E97BFDA51B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TShockInstaller", "TShockInstaller\TShockInstaller.csproj", "{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -102,6 +104,22 @@ Global
 		{90AB47F3-8220-48FC-BDAB-D6E97BFDA51B}.Release|x64.Build.0 = Release|Any CPU
 		{90AB47F3-8220-48FC-BDAB-D6E97BFDA51B}.Release|x86.ActiveCfg = Release|Any CPU
 		{90AB47F3-8220-48FC-BDAB-D6E97BFDA51B}.Release|x86.Build.0 = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|x64.Build.0 = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Debug|x86.Build.0 = Debug|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|x64.ActiveCfg = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|x64.Build.0 = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|x86.ActiveCfg = Release|Any CPU
+		{17AC4DD0-8334-4B5C-ABED-77EAF52D75FA}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/TShockInstaller/Program.cs
+++ b/TShockInstaller/Program.cs
@ -0,0 +1,128 @@
+using System.Diagnostics;
+using System.IO.Compression;
+using System.Runtime.InteropServices;
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Tar;
+
+Console.ForegroundColor = ConsoleColor.White;
+Console.WriteLine($"TShock Installer {typeof(Program).Assembly.GetName().Version}.");
+
+// reference: https://github.com/dotnet/install-scripts/blob/main/src/dotnet-install.sh
+// ./dotnet-install.sh -verbose -version 6.0.11 --runtime dotnet
+
+Console.WriteLine("Determining dotnet runtime url...");
+
+var arch = RuntimeInformation.ProcessArchitecture switch
+{
+	Architecture.X64 => "x64",
+	Architecture.Arm64 => "arm64",
+	_ => null
+};
+
+if (arch is null)
+{
+	Console.WriteLine($"{RuntimeInformation.ProcessArchitecture} is not yet supported via this installer.");
+	return;
+}
+
+string? url = null;
+if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-osx-{arch}.tar.gz";
+else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-win-{arch}.zip";
+else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-linux-{arch}.tar.gz";
+
+if(url is null)
+{
+	Console.WriteLine("Unable to determine .net runtime to install. " +
+		"Refer to https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script " +
+		"and install using --install-dir dotnet, so that the dotnet folder is beside TShock.Server[.exe]");
+	return;
+}
+
+Console.WriteLine("Using url: " + url);
+
+var filename = url.Split('/').Last();
+var is_targz = filename.EndsWith(".tar.gz");
+
+var download_info = new FileInfo(filename);
+if (!download_info.Exists) // todo hash check
+{
+	Console.WriteLine($"Downloading: {filename}...");
+
+	using var client = new HttpClient();
+	using var resp = await client.GetStreamAsync(url);
+	using var fs = new FileStream(filename, FileMode.Create);
+	await resp.CopyToAsync(fs);
+}
+else
+{
+	Console.WriteLine("Using existing download on disk: " + filename);
+}
+
+var dotnet_path = Path.Combine("dotnet", "dotnet" + (is_targz ? "" : ".exe"));
+var tshock_path = "TShock.Server" + (is_targz ? "" : ".exe");
+
+if (!File.Exists(dotnet_path))
+{
+	try
+	{
+		Console.WriteLine("Extracting to ./dotnet/");
+		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);
+			tar_archive.ExtractContents("dotnet");
+
+			[DllImport("libc", SetLastError = true)]
+			static extern int chmod(string pathname, int mode);
+
+			chmod(dotnet_path, 755);
+		}
+		else
+		{
+			ZipFile.ExtractToDirectory(filename, "dotnet");
+		}
+	}
+	catch (Exception ex)
+	{
+		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
+{
+	Console.WriteLine($"Extract skipped, existing found at: {dotnet_path}");
+}
+
+var dotnet_root = System.IO.Path.GetFullPath("dotnet");
+Console.WriteLine($"To be able to run {tshock_path} yourself set the environment variable DOTNET_ROOT={dotnet_root}");
+
+Environment.SetEnvironmentVariable("DOTNET_ROOT", dotnet_root);
+
+Console.WriteLine($"Extracted, launching: {tshock_path}");
+
+var proc = new Process();
+
+Console.CancelKeyPress += (sender, e) =>
+{
+	e.Cancel = !proc.HasExited;
+};
+
+proc.StartInfo = new()
+{
+	 FileName = tshock_path,
+};
+foreach (var arg in args)
+	proc.StartInfo.ArgumentList.Add(arg);
+proc.Start();
+await proc.WaitForExitAsync();
--- a/TShockInstaller/TShockInstaller.csproj
+++ b/TShockInstaller/TShockInstaller.csproj
@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>5.0.0</Version>
+    <PublishTrimmed>true</PublishTrimmed>
+    <AssemblyName>TShock.Installer</AssemblyName>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SharpZipLib" Version="1.4.1" />
+  </ItemGroup>
+</Project>