Moving around config files, preparing to overhaul config management

functions/core_functions.sh

@@ -71,22 +71,18 @@ fn_runfunction "${FUNCNAME}"
 
 command_stop.sh(){
 	fn_runfunction "${FUNCNAME}"
-
 }
 
 command_validate.sh(){
 	fn_runfunction "${FUNCNAME}"
-
 }
 
 command_install.sh(){
 	fn_runfunction "${FUNCNAME}"
-
 }
 
 command_ts3_server_pass.sh(){
 	fn_runfunction "${FUNCNAME}"
-
 }
 
 fn_restart(){

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}"
@@ -40,7 +52,6 @@ echo ""
 
 fn_goldsourceconfig(){
 	fn_defaultconfig
-
 	# server.cfg redirects to ${servercfg} for added security
 	echo "creating server.cfg."
 	touch "server.cfg"

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"

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"
 

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"
 

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"

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"

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"

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"

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" ""

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"

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."

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"

gamedata/games/arma3server/gamedata

@@ -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"

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"

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}"

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"

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"

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"
 
 

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"

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"

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."
 

gamedata/games/twserver/gamedata

@@ -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"

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"

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