From 5978ddb5132a9667ab5e722d32b683ed60a35ee7 Mon Sep 17 00:00:00 2001 From: Jared Ballou Date: Mon, 9 May 2016 16:34:13 -0400 Subject: [PATCH] Moving around config files, preparing to overhaul config management --- functions/core_functions.sh | 22 +- functions/install_config.sh | 215 +++++++++--------- gamedata/README.md | 1 - gamedata/engines/avalanche | 2 +- gamedata/engines/dontstarve | 2 +- gamedata/engines/idtech3 | 1 - gamedata/engines/realvirtuality | 4 +- gamedata/engines/seriousengine35 | 2 +- gamedata/engines/teeworlds | 1 - gamedata/engines/terraria | 2 +- gamedata/engines/unreal4 | 2 +- gamedata/engines/unreal_shared | 2 +- gamedata/games/arkserver/gamedata | 2 +- gamedata/games/arma3server/gamedata | 10 +- .../cfg/{config.lua => lgsm-default.lua} | 0 gamedata/games/jc2server/gamedata | 1 + .../cfg/{servertest.ini => lgsm-default.ini} | 0 gamedata/games/pzserver/gamedata | 1 + gamedata/games/roserver/gamedata | 2 +- .../{sbboot.config => lgsm-default.config} | 0 gamedata/games/sbserver/gamedata | 1 + gamedata/games/sdtdserver/gamedata | 8 +- gamedata/games/ss3sserver/gamedata | 2 +- gamedata/games/terrariaserver/gamedata | 2 +- gamedata/games/ts3server/gamedata | 2 +- gamedata/games/twserver/gamedata | 9 +- gamedata/games/ut2k4server/gamedata | 2 +- gamedata/include/default | 2 +- 28 files changed, 156 insertions(+), 144 deletions(-) rename gamedata/games/jc2server/cfg/{config.lua => lgsm-default.lua} (100%) rename gamedata/games/pzserver/cfg/{servertest.ini => lgsm-default.ini} (100%) rename gamedata/games/sbserver/cfg/{sbboot.config => lgsm-default.config} (100%) diff --git a/functions/core_functions.sh b/functions/core_functions.sh index 242e9ccc5..cc5abcaf5 100644 --- a/functions/core_functions.sh +++ b/functions/core_functions.sh @@ -70,31 +70,27 @@ fn_runfunction "${FUNCNAME}" } command_stop.sh(){ -fn_runfunction "${FUNCNAME}" - + fn_runfunction "${FUNCNAME}" } command_validate.sh(){ -fn_runfunction "${FUNCNAME}" - + fn_runfunction "${FUNCNAME}" } command_install.sh(){ -fn_runfunction "${FUNCNAME}" - + fn_runfunction "${FUNCNAME}" } command_ts3_server_pass.sh(){ -fn_runfunction "${FUNCNAME}" - + fn_runfunction "${FUNCNAME}" } fn_restart(){ -local modulename="Restarting" -info_config.sh -fn_scriptlog "${servername}" -command_stop.sh -command_start.sh + local modulename="Restarting" + info_config.sh + fn_scriptlog "${servername}" + command_stop.sh + command_start.sh } diff --git a/functions/install_config.sh b/functions/install_config.sh index 46d1ba45d..6e937f3a1 100644 --- a/functions/install_config.sh +++ b/functions/install_config.sh @@ -3,6 +3,18 @@ # Author: Daniel Gibbs # Website: http://gameservermanagers.com +# Download default config from GitHub if needed +fn_fetch_config(){ +} + +# Get all default config files for this game +fn_fetch_configs_from_github() { + echo "${servercfgdefault} ${cfgfiles}" +} +fn_fetch_configs_from_github + + + fn_defaultconfig(){ echo "creating ${servercfg} config file." cp -v "${servercfgdefault}" "${servercfgfullpath}" @@ -10,140 +22,139 @@ fn_defaultconfig(){ } fn_userinputconfig(){ -# allow user to input server name and password -if [ -z "${autoinstall}" ]; then - echo "" - echo "Configuring ${gamename} Server" - echo "=================================" + # allow user to input server name and password + if [ -z "${autoinstall}" ]; then + echo "" + echo "Configuring ${gamename} Server" + echo "=================================" + sleep 1 + read -p "Enter server name: " servername + read -p "Enter rcon password: " rconpass + else + servername="${servicename}" + rconpass="rconpassword" + fi + echo "changing hostname." + sed -i "s/\"\"/\"${servername}\"/g" "${servercfgfullpath}" + sleep 1 + echo "changing rconpassword." + sed -i "s/\"\"/\"${rconpass}\"/g" "${servercfgfullpath}" sleep 1 - read -p "Enter server name: " servername - read -p "Enter rcon password: " rconpass -else - servername="${servicename}" - rconpass="rconpassword" -fi -echo "changing hostname." -sed -i "s/\"\"/\"${servername}\"/g" "${servercfgfullpath}" -sleep 1 -echo "changing rconpassword." -sed -i "s/\"\"/\"${rconpass}\"/g" "${servercfgfullpath}" -sleep 1 } fn_arma3config(){ -fn_defaultconfig -echo "creating ${networkcfg} config file." -cp -v "${networkcfgdefault}" "${networkcfgfullpath}" -sleep 1 -echo "" + fn_defaultconfig + echo "creating ${networkcfg} config file." + cp -v "${networkcfgdefault}" "${networkcfgfullpath}" + sleep 1 + echo "" } fn_goldsourceconfig(){ -fn_defaultconfig - -# server.cfg redirects to ${servercfg} for added security -echo "creating server.cfg." -touch "server.cfg" -sleep 1 -echo "creating redirect." -echo "server.cfg > ${servercfg}." -echo "exec ${servercfg}" > "server.cfg" -sleep 1 + fn_defaultconfig + # server.cfg redirects to ${servercfg} for added security + echo "creating server.cfg." + touch "server.cfg" + sleep 1 + echo "creating redirect." + echo "server.cfg > ${servercfg}." + echo "exec ${servercfg}" > "server.cfg" + sleep 1 -# creating other files required -echo "creating listip.cfg." -touch "${systemdir}/listip.cfg" -sleep 1 -echo "creating banned.cfg." -touch "${systemdir}/banned.cfg" -sleep 1 + # creating other files required + echo "creating listip.cfg." + touch "${systemdir}/listip.cfg" + sleep 1 + echo "creating banned.cfg." + touch "${systemdir}/banned.cfg" + sleep 1 -fn_userinputconfig -echo "" + fn_userinputconfig + echo "" } fn_serious3config(){ -fn_defaultconfig -echo "" -echo "To edit ${gamename} server config use SS3 Server GUI 3 tool" -echo "http://mrag.nl/sgui3/" -sleep 1 -echo "" + fn_defaultconfig + echo "" + echo "To edit ${gamename} server config use SS3 Server GUI 3 tool" + echo "http://mrag.nl/sgui3/" + sleep 1 + echo "" } fn_sourceconfig(){ -fn_defaultconfig + fn_defaultconfig -# server.cfg redirects to ${servercfg} for added security -echo "creating server.cfg." -touch "server.cfg" -sleep 1 -echo "creating redirect." -echo "server.cfg > ${servercfg}." -echo "exec ${servercfg}" > "server.cfg" -sleep 1 + # server.cfg redirects to ${servercfg} for added security + echo "creating server.cfg." + touch "server.cfg" + sleep 1 + echo "creating redirect." + echo "server.cfg > ${servercfg}." + echo "exec ${servercfg}" > "server.cfg" + sleep 1 -fn_userinputconfig -echo "" + fn_userinputconfig + echo "" } fn_teeworldsconfig(){ -fn_defaultconfig + fn_defaultconfig -echo "adding logfile location to config." -sed -i "s@\"\"@\"${gamelog}\"@g" "${servercfgfullpath}" -sleep 1 -echo "removing password holder." -sed -i "s///" "${servercfgfullpath}" -sleep 1 + echo "adding logfile location to config." + sed -i "s@\"\"@\"${gamelog}\"@g" "${servercfgfullpath}" + sleep 1 + echo "removing password holder." + sed -i "s///" "${servercfgfullpath}" + sleep 1 -fn_userinputconfig -echo "" + fn_userinputconfig + echo "" } fn_ut99config(){ -echo "${defaultcfg} > ${servercfgfullpath}" -tr -d '\r' < "${servercfgdefault}" > "${servercfgfullpath}" -sleep 1 -echo "" -echo "Configuring ${gamename} Server" -echo "=================================" -sleep 1 -echo "enabling WebAdmin." -sed -i 's/bEnabled=False/bEnabled=True/g' "${servercfgfullpath}" -sleep 1 -echo "setting WebAdmin port to 8076." -sed -i '467i\ListenPort=8076' "${servercfgfullpath}" -sleep 1 -echo "" + echo "${defaultcfg} > ${servercfgfullpath}" + tr -d '\r' < "${servercfgdefault}" > "${servercfgfullpath}" + sleep 1 + echo "" + echo "Configuring ${gamename} Server" + echo "=================================" + sleep 1 + echo "enabling WebAdmin." + sed -i 's/bEnabled=False/bEnabled=True/g' "${servercfgfullpath}" + sleep 1 + echo "setting WebAdmin port to 8076." + sed -i '467i\ListenPort=8076' "${servercfgfullpath}" + sleep 1 + echo "" } fn_unreal2config(){ -fn_defaultconfig -echo "" -echo "Configuring ${gamename} Server" -echo "=================================" -sleep 1 -echo "setting WebAdmin username and password." -sed -i 's/AdminName=/AdminName=admin/g' "${servercfgfullpath}" -sed -i 's/AdminPassword=/AdminPassword=admin/g' "${servercfgfullpath}" -sleep 1 -echo "enabling WebAdmin." -sed -i 's/bEnabled=False/bEnabled=True/g' "${servercfgfullpath}" -if [ "${gamename}" == "Unreal Tournament 2004" ]; then - sleep 1 - echo "setting WebAdmin port to 8075." - sed -i 's/ListenPort=80/ListenPort=8075/g' "${servercfgfullpath}" -fi -sleep 1 -echo "" + fn_defaultconfig + echo "" + echo "Configuring ${gamename} Server" + echo "=================================" + sleep 1 + echo "setting WebAdmin username and password." + sed -i 's/AdminName=/AdminName=admin/g' "${servercfgfullpath}" + sed -i 's/AdminPassword=/AdminPassword=admin/g' "${servercfgfullpath}" + sleep 1 + echo "enabling WebAdmin." + sed -i 's/bEnabled=False/bEnabled=True/g' "${servercfgfullpath}" + if [ "${gamename}" == "Unreal Tournament 2004" ]; then + sleep 1 + echo "setting WebAdmin port to 8075." + sed -i 's/ListenPort=80/ListenPort=8075/g' "${servercfgfullpath}" + fi + sleep 1 + echo "" } echo "" if [ "${gamename}" != "Hurtworld" ]; then -echo "Creating Configs" -echo "=================================" -sleep 1 + echo "Creating Configs" + echo "=================================" + sleep 1 mkdir -pv "${servercfgdir}" cd "${servercfgdir}" githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}" diff --git a/gamedata/README.md b/gamedata/README.md index 900ba6594..3491f1789 100644 --- a/gamedata/README.md +++ b/gamedata/README.md @@ -65,7 +65,6 @@ fn_set_game_setting settings "executable" "./widgets_server" fn_set_game_setting settings "servercfg" "\${servicename}.cfg" fn_set_game_setting settings "servercfgdir" "\${systemdir}/cfg" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg" # Game Parameters fn_set_game_parm parms_minus "tickrate" "66" "Server tickrate" diff --git a/gamedata/engines/avalanche b/gamedata/engines/avalanche index 40135ee99..007921143 100644 --- a/gamedata/engines/avalanche +++ b/gamedata/engines/avalanche @@ -20,5 +20,5 @@ fn_set_game_setting settings "executable" "./Jcmp-Server" fn_set_game_setting settings "servercfg" "config.lua" fn_set_game_setting settings "servercfgdir" "\${filesdir}" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/default_config.lua" +fn_set_game_setting settings "servercfgdefault" "default_config.lua" diff --git a/gamedata/engines/dontstarve b/gamedata/engines/dontstarve index 7cf0b420e..9101988fa 100644 --- a/gamedata/engines/dontstarve +++ b/gamedata/engines/dontstarve @@ -17,5 +17,5 @@ fn_set_game_setting settings "executable" "./dontstarve_dedicated_server_nullren fn_set_game_setting settings "servercfg" "settings.ini" fn_set_game_setting settings "servercfgdir" "\${HOME}/.klei/DoNotStarveTogether" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" +fn_set_game_setting settings "servercfg_suffix" ".ini" diff --git a/gamedata/engines/idtech3 b/gamedata/engines/idtech3 index b17a61b8a..deb9d6fe8 100644 --- a/gamedata/engines/idtech3 +++ b/gamedata/engines/idtech3 @@ -16,7 +16,6 @@ fn_set_game_setting settings "executable" "./run_server_\${arch}.sh" fn_set_game_setting settings "servercfg" "\${servicename}.cfg" fn_set_game_setting settings "servercfgdir" "\${filesdir}/baseq3" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg" # Game Parameters fn_set_game_parm parms_set "net_strict" "1" "Net Strict" diff --git a/gamedata/engines/realvirtuality b/gamedata/engines/realvirtuality index 8ce30a99a..88e55ffc1 100644 --- a/gamedata/engines/realvirtuality +++ b/gamedata/engines/realvirtuality @@ -18,5 +18,5 @@ fn_set_game_setting settings "networkcfg" "\${servicename}.network.cfg" fn_set_game_setting settings "servercfgdir" "\${systemdir}/cfg" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" fn_set_game_setting settings "networkcfgfullpath" "\${servercfgdir}/\${networkcfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.server.cfg" -fn_set_game_setting settings "networkcfgdefault" "\${servercfgdir}/lgsm-default.network.cfg" +fn_set_game_setting settings "servercfgdefault" "lgsm-default.server.cfg" +fn_set_game_setting settings "networkcfgdefault" "lgsm-default.network.cfg" diff --git a/gamedata/engines/seriousengine35 b/gamedata/engines/seriousengine35 index 7a8720b48..7fdff333f 100644 --- a/gamedata/engines/seriousengine35 +++ b/gamedata/engines/seriousengine35 @@ -15,6 +15,6 @@ fn_set_game_setting settings "systemdir" "\${filesdir}/Bin" fn_set_game_setting settings "executable" "./runSam3_DedicatedServer.sh" fn_set_game_setting settings "executabledir" "\${systemdir}" fn_set_game_setting settings "servercfg" "\${servicename}.ini" +fn_set_game_setting settings "servercfg_suffix" "." fn_set_game_setting settings "servercfgdir" "\${filesdir}/Content/SeriousSam3/Config" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" diff --git a/gamedata/engines/teeworlds b/gamedata/engines/teeworlds index 1ea226e48..07e1182c0 100644 --- a/gamedata/engines/teeworlds +++ b/gamedata/engines/teeworlds @@ -12,4 +12,3 @@ fn_set_game_setting settings "executable" "./teeworlds_srv" fn_set_game_setting settings "servercfg" "\${servicename}.cfg" # Teeworlds can also auto load any config if an autoexec.cfg file is present in the server dir fn_set_game_setting settings "servercfgdir" "\${filesdir}" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg" diff --git a/gamedata/engines/terraria b/gamedata/engines/terraria index 415abce15..4af301d3c 100644 --- a/gamedata/engines/terraria +++ b/gamedata/engines/terraria @@ -11,5 +11,5 @@ fn_set_game_setting settings "executable" "./TerrariaServer" fn_set_game_setting settings "servercfg" "\${servicename}.txt" fn_set_game_setting settings "servercfgdir" "\${filesdir}" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.txt" +fn_set_game_setting settings "servercfg_suffix" ".txt" fn_set_game_setting settings "gamelogdir" "" diff --git a/gamedata/engines/unreal4 b/gamedata/engines/unreal4 index f13e89e91..bf565072f 100644 --- a/gamedata/engines/unreal4 +++ b/gamedata/engines/unreal4 @@ -8,6 +8,6 @@ fn_import_game_settings engines/unreal_shared fn_set_game_setting settings "systemdir" "\${filesdir}/\${game}" fn_set_game_setting settings "executabledir" "\${systemdir}/Binaries/Linux" fn_set_game_setting settings "executable" "./\${game}Server" +fn_set_game_setting settings "servercfg_suffix" ".ini" fn_set_game_setting settings "servercfg" "GameUserSettings.ini" fn_set_game_setting settings "servercfgdir" "\${systemdir}/Saved/Config/LinuxServer" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" diff --git a/gamedata/engines/unreal_shared b/gamedata/engines/unreal_shared index 24bad93b8..29b2c0120 100644 --- a/gamedata/engines/unreal_shared +++ b/gamedata/engines/unreal_shared @@ -12,7 +12,7 @@ fn_set_game_setting settings "servercfgdir" "${systemdir}" fn_set_game_setting settings "servercfg" "${servicename}.ini" fn_set_game_setting settings "executable" "./ucc-bin" fn_set_game_setting settings "servercfgfullpath" "${servercfgdir}/${servercfg}" -fn_set_game_setting settings "servercfgdefault" "${servercfgdir}/Default.ini" +fn_set_game_setting settings "servercfgdefault" "Default.ini" fn_set_game_setting settings "compressedmapsdir" "${rootdir}/Maps-Compressed" "Compressed Maps Directory" fn_set_game_setting scriptactions "c" "console|command_console.sh|Console View." diff --git a/gamedata/games/arkserver/gamedata b/gamedata/games/arkserver/gamedata index 372a4fa6d..43f1e7539 100644 --- a/gamedata/games/arkserver/gamedata +++ b/gamedata/games/arkserver/gamedata @@ -17,7 +17,7 @@ fn_set_game_setting settings "gamename" "ARK: Survival Evolved" fn_set_game_setting settings "systemdir" "\${filesdir}/\${game}" fn_set_game_setting settings "executabledir" "\${systemdir}/Binaries/Linux" fn_set_game_setting settings "executable" "./\${game}Server" +fn_set_game_setting settings "servercfg_suffix" ".ini" fn_set_game_setting settings "servercfg" "GameUserSettings.ini" fn_set_game_setting settings "servercfgdir" "\${systemdir}/Saved/Config/LinuxServer" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" diff --git a/gamedata/games/arma3server/gamedata b/gamedata/games/arma3server/gamedata index 97ad7962b..215c31823 100644 --- a/gamedata/games/arma3server/gamedata +++ b/gamedata/games/arma3server/gamedata @@ -3,7 +3,7 @@ fn_import_game_settings engines/realvirtuality fn_parms(){ -parms="-netlog -ip=${ip} -port=${port} -cfg=${cfg} -config=${config} -mod=${mod} -servermod=${servermod} -bepath=${bepath} -autoinit -loadmissiontomemory" + parms="-netlog -ip=${ip} -port=${port} -cfg=${cfg} -config=${config} -mod=${mod} -servermod=${servermod} -bepath=${bepath} -autoinit -loadmissiontomemory" } # Game Settings @@ -12,17 +12,17 @@ fn_set_game_setting settings "gamename" "Arma 3" fn_set_game_setting settings "executabledir" "\${filesdir}" fn_set_game_setting settings "executable" "./arma3server" fn_set_game_setting settings "servercfg" "\${servicename}.server.cfg" -fn_set_game_setting settings "networkcfg" "\${servicename}.network.cfg" "Network Config" +fn_set_game_setting settings "networkcfg" "\${servicename}.network.cfg" +fn_set_game_setting settings "cfgfiles" "lgsm-default.network.cfg:\${networkcfg}" fn_set_game_setting settings "servercfgdir" "\${systemdir}/cfg" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" fn_set_game_setting settings "networkcfgfullpath" "\${servercfgdir}/\${networkcfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.server.cfg" -fn_set_game_setting settings "networkcfgdefault" "\${servercfgdir}/lgsm-default.network.cfg" "Default Network Config File" +fn_set_game_setting settings "servercfgdefault" "lgsm-default.server.cfg" # Game Parms fn_set_game_parm parms_minus "netlog" " " "Net Logging" fn_set_game_parm parms_minus "port" "2302" -fn_set_game_parm parms_minus "cfg" "\${servercfgdir}/lgsm-default.network.cfg" "Network Config File" +fn_set_game_parm parms_minus "cfg" "\${networkcfgfullpath}" "Network Config File" fn_set_game_parm parms_minus "config" "\${servercfgfullpath}" "Server Config File" fn_set_game_parm parms_minus "mod" "--EMPTY--" "List of mods to use" fn_set_game_parm parms_minus "servermod" "--EMPTY--" "Server Mods" diff --git a/gamedata/games/jc2server/cfg/config.lua b/gamedata/games/jc2server/cfg/lgsm-default.lua similarity index 100% rename from gamedata/games/jc2server/cfg/config.lua rename to gamedata/games/jc2server/cfg/lgsm-default.lua diff --git a/gamedata/games/jc2server/gamedata b/gamedata/games/jc2server/gamedata index 386617239..4e332739a 100644 --- a/gamedata/games/jc2server/gamedata +++ b/gamedata/games/jc2server/gamedata @@ -8,3 +8,4 @@ parms="" fn_set_game_setting settings "appid" "261140" fn_set_game_setting settings "gamename" "Just Cause 2" +fn_set_game_setting settings "servercfg_suffix" ".lua" diff --git a/gamedata/games/pzserver/cfg/servertest.ini b/gamedata/games/pzserver/cfg/lgsm-default.ini similarity index 100% rename from gamedata/games/pzserver/cfg/servertest.ini rename to gamedata/games/pzserver/cfg/lgsm-default.ini diff --git a/gamedata/games/pzserver/gamedata b/gamedata/games/pzserver/gamedata index 91c25d338..9094d7b3d 100644 --- a/gamedata/games/pzserver/gamedata +++ b/gamedata/games/pzserver/gamedata @@ -12,6 +12,7 @@ fn_set_game_setting settings "gamename" "Project Zomboid" fn_set_game_setting settings "systemdir" "\${filesdir}" fn_set_game_setting settings "executabledir" "\${filesdir}" fn_set_game_setting settings "executable" "./start-server.sh" +fn_set_game_setting settings "servercfg_suffix" ".ini" fn_set_game_setting settings "servercfg" "servertest.ini" fn_set_game_setting settings "servercfgdir" "\${HOME}/Zomboid/Server" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" diff --git a/gamedata/games/roserver/gamedata b/gamedata/games/roserver/gamedata index 097789b81..7a984fdb4 100644 --- a/gamedata/games/roserver/gamedata +++ b/gamedata/games/roserver/gamedata @@ -13,4 +13,4 @@ fn_set_game_setting settings "map" "RO-Arad.rom" # Lower Case wtf? fn_set_game_setting settings "systemdir" "${filesdir}/system" -fn_set_game_setting settings "servercfgdefault" "${servercfgdir}/default.ini" +fn_set_game_setting settings "servercfgdefault" "default.ini" diff --git a/gamedata/games/sbserver/cfg/sbboot.config b/gamedata/games/sbserver/cfg/lgsm-default.config similarity index 100% rename from gamedata/games/sbserver/cfg/sbboot.config rename to gamedata/games/sbserver/cfg/lgsm-default.config diff --git a/gamedata/games/sbserver/gamedata b/gamedata/games/sbserver/gamedata index 104aa9b11..e1f8df6b5 100644 --- a/gamedata/games/sbserver/gamedata +++ b/gamedata/games/sbserver/gamedata @@ -10,6 +10,7 @@ fn_set_game_setting settings "gamename" "StarBound" fn_set_game_setting settings "game" "starbound" fn_set_game_setting settings "executabledir" "${filesdir}/linux64" fn_set_game_setting settings "executable" "./starbound_server" +fn_set_game_setting settings "servercfg_suffix" ".config" fn_set_game_setting settings "servercfg" "sbboot.config" fn_set_game_setting settings "servercfgdir" "${executabledir}" fn_set_game_setting settings "gamelogdir" "${filesdir}/giraffe_storage" diff --git a/gamedata/games/sdtdserver/gamedata b/gamedata/games/sdtdserver/gamedata index 5369a84a8..034421504 100644 --- a/gamedata/games/sdtdserver/gamedata +++ b/gamedata/games/sdtdserver/gamedata @@ -10,9 +10,9 @@ parms="-configfile=${servercfgfullpath} -dedicated" fn_set_game_setting settings "appid" "294420" fn_set_game_setting settings "gamename" "7 Days To Die" fn_set_game_setting settings "executable" "./startserver.sh" -fn_set_game_setting settings "servercfg" "${servicename}.xml" -fn_set_game_setting settings "servercfgdir" "${filesdir}" -fn_set_game_setting settings "servercfgfullpath" "${servercfgdir}/${servercfg}" -fn_set_game_setting settings "servercfgdefault" "${servercfgdir}/serverconfig.xml" +fn_set_game_setting settings "servercfg" "\${servicename}.xml" +fn_set_game_setting settings "servercfgdir" "\${filesdir}" +fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" +fn_set_game_setting settings "servercfgdefault" "serverconfig.xml" diff --git a/gamedata/games/ss3sserver/gamedata b/gamedata/games/ss3sserver/gamedata index 1330cb5d5..32d79eab6 100644 --- a/gamedata/games/ss3sserver/gamedata +++ b/gamedata/games/ss3sserver/gamedata @@ -15,4 +15,4 @@ fn_set_game_setting settings "executabledir" "\${systemdir}" fn_set_game_setting settings "servercfg" "\${servicename}.ini" fn_set_game_setting settings "servercfgdir" "\${filesdir}/Content/SeriousSam3/Config" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" +fn_set_game_setting settings "servercfg_suffix" ".ini" diff --git a/gamedata/games/terrariaserver/gamedata b/gamedata/games/terrariaserver/gamedata index 01bc4dc7d..2b00f8660 100644 --- a/gamedata/games/terrariaserver/gamedata +++ b/gamedata/games/terrariaserver/gamedata @@ -13,5 +13,5 @@ fn_set_game_setting settings "executable" "./TerrariaServer" fn_set_game_setting settings "servercfg" "\${servicename}.txt" fn_set_game_setting settings "servercfgdir" "\${filesdir}" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.txt" +fn_set_game_setting settings "servercfg_suffix" ".txt" fn_set_game_setting settings "gamelogdir" "" "Terraria Doesn't Have a Server Log" diff --git a/gamedata/games/ts3server/gamedata b/gamedata/games/ts3server/gamedata index e50a3db3b..2cab94a5d 100644 --- a/gamedata/games/ts3server/gamedata +++ b/gamedata/games/ts3server/gamedata @@ -12,7 +12,7 @@ fn_set_game_setting settings "executabledir" "\${filesdir}" fn_set_game_setting settings "executable" "./ts3server_startscript.sh" fn_set_game_setting settings "servercfg" "\${servicename}.ini" fn_set_game_setting settings "servercfgdir" "\${filesdir}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.ini" +fn_set_game_setting settings "servercfg_suffix" ".ini" fn_set_game_setting scriptactions "pw" "change-password|command_ts3_server_pass.sh|Change Password." diff --git a/gamedata/games/twserver/gamedata b/gamedata/games/twserver/gamedata index 6823ee066..0a6131519 100644 --- a/gamedata/games/twserver/gamedata +++ b/gamedata/games/twserver/gamedata @@ -3,7 +3,7 @@ fn_import_game_settings engines/teeworlds fn_parms(){ -parms="-f ${servercfgfullpath}" + parms="-f ${servercfgfullpath}" } fn_set_game_setting settings "appid" "380840" @@ -15,4 +15,9 @@ fn_set_game_setting settings "executable" "./teeworlds_srv" fn_set_game_setting settings "servercfg" "\${servicename}.cfg" fn_set_game_setting settings "servercfgdir" "\${filesdir}" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg" + +fn_set_game_setting settings "cfgfiles" "ctf.cfg dm.cfg duel.cfg tdm.cfg" +fn_set_game_setting cfgfiles "ctf.cfg" +fn_set_game_setting cfgfiles "dm.cfg" +fn_set_game_setting cfgfiles "duel.cfg" +fn_set_game_setting cfgfiles "tdm.cfg" diff --git a/gamedata/games/ut2k4server/gamedata b/gamedata/games/ut2k4server/gamedata index 241b11656..0758650c6 100644 --- a/gamedata/games/ut2k4server/gamedata +++ b/gamedata/games/ut2k4server/gamedata @@ -9,4 +9,4 @@ fn_set_game_setting settings "gamename" "Unreal Tournament 2004" fn_set_game_setting settings "map" "DM-Rankin" # Why isn't this Default? -fn_set_game_setting settings "servercfgdefault" "${servercfgdir}/UT2004.ini" +fn_set_game_setting settings "servercfgdefault" "UT2004.ini" diff --git a/gamedata/include/default b/gamedata/include/default index 7fe5b5ff8..4094ae652 100644 --- a/gamedata/include/default +++ b/gamedata/include/default @@ -38,7 +38,7 @@ fn_set_game_setting settings "executable" "--EMPTY--" "Executable to invoke to s fn_set_game_setting settings "servercfgdir" "\${systemdir}/cfg" "Server config directory" fn_set_game_setting settings "servercfg" "\${servicename}\${servercfg_suffix}" "Server config file for this instance" -fn_set_game_setting settings "servercfgdefault" "\${servercfgdir}/lgsm-default\${servercfg_suffix}" "Default server configuration file" +fn_set_game_setting settings "servercfgdefault" "lgsm-default\${servercfg_suffix}" "Default server configuration file" fn_set_game_setting settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}" "Full path to server config" # Set the default settings for the script