From eb8fcc1900517769d1b4f93c2e5e19e74e75f3cd Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 27 Sep 2018 15:40:56 -0400 Subject: [PATCH] Dedupe some strings --- .../Components/Byond/PosixByondInstaller.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs b/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs index c467d4c08b..5bf642cdcb 100644 --- a/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs @@ -24,11 +24,15 @@ namespace Tgstation.Server.Host.Components.Byond /// const string ByondCachePath = "~/.byond/cache"; - /// - public string DreamDaemonName => "DreamDaemon.sh"; + const string DreamDaemonExecutableName = "DreamDaemon"; + const string DreamMakerExecutableName = "DreamMaker"; + const string ShellScriptExtension = ".sh"; /// - public string DreamMakerName => "DreamMaker.sh"; + public string DreamDaemonName => DreamDaemonExecutableName + ShellScriptExtension; + + /// + public string DreamMakerName => DreamMakerExecutableName + ShellScriptExtension; /// /// The for the @@ -107,9 +111,6 @@ namespace Tgstation.Server.Host.Components.Byond //need to add $ORIGIN to LD_LIBRARY_PATH const string StandardScript = "#!/bin/sh\nexport LD_LIBRARY_PATH=\"\\$ORIGIN:$LD_LIBRARY_PATH\"\nBASEDIR=$(dirname \"$0\")\nexec \"$BASEDIR/{0}\" \"$@\"\n"; - const string DreamDaemonExecutableName = "DreamDaemon"; - const string DreamMakerExecutableName = "DreamMaker"; - var dreamDaemonScript = String.Format(CultureInfo.InvariantCulture, StandardScript, DreamDaemonExecutableName); var dreamMakerScript = String.Format(CultureInfo.InvariantCulture, StandardScript, DreamMakerExecutableName);