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

Merge pull request #119 from Cyberboss/fixbyond

Browse Source 
Fix BYOND CL
This commit is contained in:
Jordan Brown
2017-07-05 14:33:22 -04:00
committed by GitHub
parent c042f695c0 aabd6837c8
commit 1505eb25fe
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGCommandLine/BYONDCommands.cs
+11 -11
View File
@@ -32,7 +32,7 @@ namespace TGCommandLine
type = TGByondVersion.Staged;
else if (parameters[0].ToLower() == "--latest")
type = TGByondVersion.Latest;
Console.WriteLine(Server.GetComponent<ITGByond>().GetVersion(type) ?? "Unistalled");
OutputProc(Server.GetComponent<ITGByond>().GetVersion(type) ?? "Unistalled");
return ExitCode.Normal;
}
public override string GetArgumentString()
@@ -58,25 +58,25 @@ namespace TGCommandLine
switch (Server.GetComponent<ITGByond>().CurrentStatus())
{
case TGByondStatus.Downloading:
Console.WriteLine("Downloading update...");
OutputProc("Downloading update...");
break;
case TGByondStatus.Idle:
Console.WriteLine("Updater Idle");
OutputProc("Updater Idle");
break;
case TGByondStatus.Staged:
Console.WriteLine("Update staged and awaiting server restart");
OutputProc("Update staged and awaiting server restart");
break;
case TGByondStatus.Staging:
Console.WriteLine("Staging update...");
OutputProc("Staging update...");
break;
case TGByondStatus.Starting:
Console.WriteLine("Starting update...");
OutputProc("Starting update...");
break;
case TGByondStatus.Updating:
Console.WriteLine("Applying update...");
OutputProc("Applying update...");
break;
default:
Console.WriteLine("Limmexing (This is an error).");
OutputProc("Limmexing (This is an error).");
return ExitCode.ServerError;
}
return ExitCode.Normal;
@@ -104,7 +104,7 @@ namespace TGCommandLine
}
catch
{
Console.WriteLine("Please enter version as <Major>.<Minor>");
OutputProc("Please enter version as <Major>.<Minor>");
return ExitCode.BadCommand;
}
@@ -112,7 +112,7 @@ namespace TGCommandLine
if (!BYOND.UpdateToVersion(Major, Minor))
{
Console.WriteLine("Failed to begin update!");
OutputProc("Failed to begin update!");
return ExitCode.ServerError;
}
@@ -123,7 +123,7 @@ namespace TGCommandLine
stat = BYOND.CurrentStatus();
}
var res = BYOND.GetError();
Console.WriteLine(res ?? (stat == TGByondStatus.Staged ? "Update staged and will apply next DD reboot" : "Update finished"));
OutputProc(res ?? (stat == TGByondStatus.Staged ? "Update staged and will apply next DD reboot" : "Update finished"));
return res == null ? ExitCode.Normal : ExitCode.ServerError;
}
public override string GetArgumentString()
TGServerService/ChatCommands.cs
+4 -4
View File
@@ -115,13 +115,13 @@ namespace TGServerService
}
protected override ExitCode Run(IList<string> parameters)
{
var type = TGByondVersion.Installed;
if (parameters.Count > 0)
if (parameters[0].ToLower() == "--staged")
OutputProc(Instance.GetVersion(TGByondVersion.Staged) ?? "None");
type = TGByondVersion.Staged;
else if (parameters[0].ToLower() == "--latest")
OutputProc(Instance.GetVersion(TGByondVersion.Latest) ?? "Unknown");
else
OutputProc(Instance.GetVersion(TGByondVersion.Installed) ?? "Uninstalled");
type = TGByondVersion.Latest;
OutputProc(Instance.GetVersion(type) ?? "None");
return ExitCode.Normal;
}