mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-30 08:33:19 +01:00
Merge pull request #371 from Cyberboss/MoreInstallerFixes
More installer fixes
This commit is contained in:
@@ -384,7 +384,9 @@ namespace TGS.Installer.UI
|
||||
Microsoft.Deployment.WindowsInstaller.Installer.EnableLog(InstallLogModes.Verbose | InstallLogModes.PropertyDump, logfile);
|
||||
}
|
||||
var cl = String.Join(" ", args);
|
||||
Microsoft.Deployment.WindowsInstaller.Installer.SetInternalUI(InstallUIOptions.Silent);
|
||||
|
||||
// TODO: Uncomment this when OnUIUpdate is more robust
|
||||
// Microsoft.Deployment.WindowsInstaller.Installer.SetInternalUI(InstallUIOptions.Silent);
|
||||
Microsoft.Deployment.WindowsInstaller.Installer.SetExternalUI(OnUIUpdate, InstallLogModes.Progress);
|
||||
|
||||
await Task.Factory.StartNew(() => Microsoft.Deployment.WindowsInstaller.Installer.InstallProduct(msipath, cl));
|
||||
|
||||
@@ -19,6 +19,14 @@ namespace TGS.Server.Service
|
||||
/// </summary>
|
||||
Server activeServer;
|
||||
|
||||
/// <summary>
|
||||
/// Constructs a <see cref="Service"/>
|
||||
/// </summary>
|
||||
Service()
|
||||
{
|
||||
ServiceName = "TG Station Server";
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public void WriteAccess(string username, bool authSuccess, byte loggingID)
|
||||
{
|
||||
|
||||
@@ -164,6 +164,7 @@ namespace TGS.Server
|
||||
/// </summary>
|
||||
void SetupConfig()
|
||||
{
|
||||
Directory.CreateDirectory(DefaultConfigDirectory);
|
||||
try
|
||||
{
|
||||
Config = ServerConfig.Load(DefaultConfigDirectory);
|
||||
|
||||
Reference in New Issue
Block a user