cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 00:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #520 from Cyberboss/DXInstall

Browse Source 
Auto install included DX redis if upgrading to a byond version >= 512.1427
This commit is contained in:
Jordan Brown
2018-06-14 16:30:18 -04:00
committed by GitHub
parent 72a22245de dc95bea143
commit 866ee65cd8
1 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.Server/Instance/Byond.cs
+54 -7
View File
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Net;
using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Threading;
using TGS.Interface;
@@ -43,7 +44,11 @@ namespace TGS.Server
/// <summary>
/// The instance directory to modify the BYOND cfg before installation
/// </summary>
const string ByondConfigDir = StagingDirectory + "/BYOND/cfg";
const string ByondConfigDir = StagingDirectoryInner + "/cfg";
/// <summary>
/// The instance that contains the BYOND directx redistributable
/// </summary>
const string ByondDXDir = StagingDirectoryInner + "/directx";
/// <summary>
/// BYOND's DreamDaemon config file in the cfg modification directory
/// </summary>
@@ -76,6 +81,11 @@ namespace TGS.Server
/// </summary>
Thread RevisionStaging;
/// <summary>
/// Global lock for installing DirectX if necessary
/// </summary>
static object DirectXInstallLock = new object();
/// <summary>
/// Called when the <see cref="Instance"/> is setup. Prepares the BYOND updater
/// </summary>
@@ -261,14 +271,51 @@ namespace TGS.Server
//STAGING
ZipFile.ExtractToDirectory(rrdp, RelativePath(StagingDirectory));
lock (ByondLock)
File.Delete(rrdp);
//IMPORTANT: SET THE BYOND CONFIG TO NOT PROMPT FOR TRUSTED MODE REEE
Directory.CreateDirectory(RelativePath(ByondConfigDir));
File.WriteAllText(RelativePath(ByondDDConfig), ByondNoPromptTrustedMode);
if (major >= 512 && minor >= 1427)
{
File.WriteAllText(RelativePath(StagingDirectoryInner + VersionFile), String.Format("{0}.{1}", major, minor));
//IMPORTANT: SET THE BYOND CONFIG TO NOT PROMPT FOR TRUSTED MODE REEE
Directory.CreateDirectory(RelativePath(ByondConfigDir));
File.WriteAllText(RelativePath(ByondDDConfig), ByondNoPromptTrustedMode);
if (Monitor.TryEnter(DirectXInstallLock))
try
{
//always install it, it's pretty fast and will do better redundancy checking than us
using (var p = new Process())
{
p.StartInfo.Arguments = "/silent";
var rbdx = RelativePath(ByondDXDir);
p.StartInfo.FileName = rbdx + "/DXSETUP.exe";
p.StartInfo.UseShellExecute = false;
p.StartInfo.WorkingDirectory = rbdx;
p.Start();
try
{
p.WaitForExit();
}
finally
{
try
{
p.Kill();
p.WaitForExit();
}
catch (InvalidOperationException) { }
}
if(p.ExitCode != 0)
throw new Exception("Failed to install included DirectX! Exit code: " + p.ExitCode);
}
}
finally
{
Monitor.Exit(DirectXInstallLock);
}
}
File.Delete(RevisionDownloadPath);
lock (ByondLock)
File.WriteAllText(RelativePath(StagingDirectoryInner + VersionFile), String.Format("{0}.{1}", major, minor));
lock (ByondLock)
{