From b529d62bc23008dbec43f07d00c416a1e10047ba Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 5 Jul 2021 09:08:45 -0400 Subject: [PATCH] Standardize some variable names --- .../Components/Byond/ByondInstallerBase.cs | 4 ++-- .../Components/Byond/PosixByondInstaller.cs | 2 +- .../Components/Byond/WindowsByondInstaller.cs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs b/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs index 0c3fb51093..234e017939 100644 --- a/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs +++ b/src/Tgstation.Server.Host/Components/Byond/ByondInstallerBase.cs @@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.Components.Byond /// /// Gets the URL formatter string for downloading a byond version of {0:Major} {1:Minor}. /// - protected abstract string ByondRevisionsURLTemplate { get; } + protected abstract string ByondRevisionsUrlTemplate { get; } /// /// Gets the for the . @@ -84,7 +84,7 @@ namespace Tgstation.Server.Host.Components.Byond if (version == null) throw new ArgumentNullException(nameof(version)); - var url = String.Format(CultureInfo.InvariantCulture, ByondRevisionsURLTemplate, version.Major, version.Minor); + var url = String.Format(CultureInfo.InvariantCulture, ByondRevisionsUrlTemplate, version.Major, version.Minor); Logger.LogTrace("Downloading from: {0}", url); diff --git a/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs b/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs index 099d0ab63e..17d5d769c3 100644 --- a/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs @@ -40,7 +40,7 @@ namespace Tgstation.Server.Host.Components.Byond public override string PathToUserByondFolder { get; } /// - protected override string ByondRevisionsURLTemplate => "https://secure.byond.com/download/build/{0}/{0}.{1}_byond_linux.zip"; + protected override string ByondRevisionsUrlTemplate => "https://secure.byond.com/download/build/{0}/{0}.{1}_byond_linux.zip"; /// /// The for the . diff --git a/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs b/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs index 251a65ca22..69d4240125 100644 --- a/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs @@ -21,15 +21,15 @@ namespace Tgstation.Server.Host.Components.Byond /// /// Directory to byond installation configuration. /// - const string ByondConfigDir = "byond/cfg"; + const string ByondConfigDirectory = "byond/cfg"; /// /// BYOND's DreamDaemon config file. /// - const string ByondDDConfig = "daemon.txt"; + const string ByondDreamDaemonConfigFilename = "daemon.txt"; /// - /// Setting to add to to suppress an invisible user prompt for running a trusted mode .dmb. + /// Setting to add to to suppress an invisible user prompt for running a trusted mode .dmb. /// const string ByondNoPromptTrustedMode = "trusted-check 0"; @@ -48,7 +48,7 @@ namespace Tgstation.Server.Host.Components.Byond public override string PathToUserByondFolder { get; } /// - protected override string ByondRevisionsURLTemplate => "https://secure.byond.com/download/build/{0}/{0}.{1}_byond.zip"; + protected override string ByondRevisionsUrlTemplate => "https://secure.byond.com/download/build/{0}/{0}.{1}_byond.zip"; /// /// The for the . @@ -100,10 +100,10 @@ namespace Tgstation.Server.Host.Components.Byond /// A representing the running operation. async Task SetNoPromptTrusted(string path, CancellationToken cancellationToken) { - var configPath = IOManager.ConcatPath(path, ByondConfigDir); + var configPath = IOManager.ConcatPath(path, ByondConfigDirectory); await IOManager.CreateDirectory(configPath, cancellationToken).ConfigureAwait(false); - var configFilePath = IOManager.ConcatPath(configPath, ByondDDConfig); + var configFilePath = IOManager.ConcatPath(configPath, ByondDreamDaemonConfigFilename); Logger.LogTrace("Disabling trusted prompts in {0}...", configFilePath); await IOManager.WriteAllBytes( configFilePath,