From 0853fd36e2bb84d6d0daaec70c20193d3aafc9c9 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 15 Oct 2023 15:40:19 -0400 Subject: [PATCH] Rename BYOND bin const to be more specific --- .../Components/Engine/ByondInstallerBase.cs | 4 ++-- .../Components/Engine/PosixByondInstaller.cs | 2 +- .../Components/Engine/WindowsByondInstaller.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Engine/ByondInstallerBase.cs b/src/Tgstation.Server.Host/Components/Engine/ByondInstallerBase.cs index c465feb1df..c584d42331 100644 --- a/src/Tgstation.Server.Host/Components/Engine/ByondInstallerBase.cs +++ b/src/Tgstation.Server.Host/Components/Engine/ByondInstallerBase.cs @@ -22,7 +22,7 @@ namespace Tgstation.Server.Host.Components.Engine /// /// The path to the BYOND bin folder. /// - protected const string BinPath = "byond/bin"; + protected const string ByondBinPath = "byond/bin"; /// /// The name of BYOND's cache directory. @@ -89,7 +89,7 @@ namespace Tgstation.Server.Host.Components.Engine { CheckVersionValidity(version); - var binPathForVersion = IOManager.ConcatPath(path, BinPath); + var binPathForVersion = IOManager.ConcatPath(path, ByondBinPath); var supportsMapThreads = version.Version >= MapThreadsVersion; return new ByondInstallation( diff --git a/src/Tgstation.Server.Host/Components/Engine/PosixByondInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/PosixByondInstaller.cs index e82b3f133d..c4906308b5 100644 --- a/src/Tgstation.Server.Host/Components/Engine/PosixByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Engine/PosixByondInstaller.cs @@ -89,7 +89,7 @@ namespace Tgstation.Server.Host.Components.Engine postWriteHandler.HandleWrite(IOManager.ResolvePath(pathToScript)); } - var basePath = IOManager.ConcatPath(path, BinPath); + var basePath = IOManager.ConcatPath(path, ByondBinPath); var ddTask = WriteAndMakeExecutable( IOManager.ConcatPath(basePath, GetDreamDaemonName(version.Version, out _)), diff --git a/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs index 3c5b44f097..95950c06d6 100644 --- a/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Engine/WindowsByondInstaller.cs @@ -235,7 +235,7 @@ namespace Tgstation.Server.Host.Components.Engine var dreamDaemonPath = IOManager.ResolvePath( IOManager.ConcatPath( path, - BinPath, + ByondBinPath, dreamDaemonName)); int exitCode;