standardised servercfgdir

GameServerManagers · Mar 13, 2020 · 64a0dc9 · 64a0dc9
1 parent 39ccce5
commit 64a0dc9
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/lgsm/config-default/config-lgsm/ecoserver/_default.cfg b/lgsm/config-default/config-lgsm/ecoserver/_default.cfg
@@ -142,7 +142,7 @@ glibc="null"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="mono ./EcoServer.exe"
-servercfgdir="${serverfiles}/Configs"
+servercfgdir="${systemdir}/Configs"
 servercfg="Network.eco"
 servercfgdefault="Network.eco"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg
@@ -142,7 +142,7 @@ glibc="2.18"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/bin/x64"
 executable="./factorio"
-servercfgdir="${serverfiles}/data"
+servercfgdir="${systemdir}/data"
 servercfg="${selfname}.json"
 servercfgdefault="server-settings.json"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg
@@ -142,7 +142,7 @@ glibc="2.13"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./Jcmp-Server"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="config.lua"
 servercfgdefault="config.lua"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
@@ -142,7 +142,7 @@ glibc="2.17"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./Server"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="config.json"
 servercfgdefault="config.json"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/mcbserver/_default.cfg b/lgsm/config-default/config-lgsm/mcbserver/_default.cfg
@@ -134,7 +134,7 @@ glibc="2.27"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="${serverfiles}/bedrock_server"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="server.properties"
 servercfgdefault="server.properties"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/mcserver/_default.cfg b/lgsm/config-default/config-lgsm/mcserver/_default.cfg
@@ -140,7 +140,7 @@ glibc="null"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="java -Xmx${javaram}M -jar ${serverfiles}/minecraft_server.jar"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="server.properties"
 servercfgdefault="server.properties"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
@@ -136,7 +136,7 @@ glibc="2.3"
 systemdir="${serverfiles}/main"
 executabledir="${serverfiles}"
 executable="./mohaa_lnxded"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.cfg"
 servercfgdefault="server.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg b/lgsm/config-default/config-lgsm/mumbleserver/_default.cfg
@@ -135,7 +135,7 @@ glibc="null"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./murmur.x86"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.ini"
 servercfgdefault="murmur.ini"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
@@ -157,7 +157,7 @@ glibc="2.15"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/ia32"
 executable="./ns2combatserver_linux32"
-servercfgdir="${serverfiles}/${selfname}"
+servercfgdir="${systemdir}/${selfname}"
 modstoragedir="${servercfgdir}/Workshop"
 
 ## Backup Directory

diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
@@ -161,7 +161,7 @@ glibc="2.17"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/x64"
 executable="./server_linux"
-servercfgdir="${serverfiles}/${selfname}"
+servercfgdir="${systemdir}/${selfname}"
 modstoragedir="${servercfgdir}/Workshop"
 
 ## Backup Directory

diff --git a/lgsm/config-default/config-lgsm/onsetserver/_default.cfg b/lgsm/config-default/config-lgsm/onsetserver/_default.cfg
@@ -142,7 +142,7 @@ glibc="2.24"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./OnsetServer"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="server_config.json"
 servercfgdefault="server_config.json"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg
@@ -144,7 +144,7 @@ glibc="2.15"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable=$([ "$(uname -m)" == "x86_64" ] && echo -e "./run_server_x64.sh" || echo -e "./run_server_x86.sh")
-servercfgdir="${serverfiles}/baseq3"
+servercfgdir="${systemdir}/baseq3"
 servercfg="${selfname}.cfg"
 servercfgdefault="server.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/rwserver/_default.cfg b/lgsm/config-default/config-lgsm/rwserver/_default.cfg
@@ -145,7 +145,7 @@ glibc="null"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="java -Xmx${javaram}m -jar ${serverfiles}/server.jar"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="server.properties"
 servercfgdefault="server.properties"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/sbserver/_default.cfg b/lgsm/config-default/config-lgsm/sbserver/_default.cfg
@@ -148,7 +148,7 @@ glibc="2.17"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/linux"
 executable="./starbound_server"
-servercfgdir="${serverfiles}/storage"
+servercfgdir="${systemdir}/storage"
 servercfg="starbound_server.config"
 servercfgdefault="starbound_server.config"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg
@@ -145,7 +145,7 @@ glibc="2.15"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable=$([ "$(uname -m)" == "x86_64" ] && echo -e "./7DaysToDieServer.x86_64" || echo -e "./7DaysToDieServer.x86")
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.xml"
 servercfgdirdefault="${serverfiles}"
 servercfgdefault="serverconfig.xml"

diff --git a/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg b/lgsm/config-default/config-lgsm/terrariaserver/_default.cfg
@@ -149,7 +149,7 @@ glibc="2.7"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./TerrariaServer"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.txt"
 servercfgdefault="serverconfig.txt"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/ts3server/_default.cfg b/lgsm/config-default/config-lgsm/ts3server/_default.cfg
@@ -138,7 +138,7 @@ glibc="2.17"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./ts3server"
-servercfgdir="${serverfiles}"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.ini"
 servercfgdefault="ts3server.ini"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg
@@ -149,7 +149,7 @@ glibc="2.14"
 systemdir="${serverfiles}/tw"
 executabledir="${systemdir}"
 executable="./teeworlds_srv"
-servercfgdir="${serverfiles}/tw"
+servercfgdir="${systemdir}"
 servercfg="${selfname}.cfg" # Teeworlds can also auto load any config if an autoexec.cfg file is present in the server dir
 servercfgdefault="server.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"

diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh
@@ -60,7 +60,7 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_console.sh command_debug.sh command_details.sh command_monitor.sh command_start.sh command_stop.sh )
+local allowed_commands_array=( command_console.sh command_debug.sh command_monitor.sh command_start.sh command_stop.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
 	if [ "${allowed_command}" == "${function_selfname}" ]; then