From 83cf3012e8c61600e6064b900d0bac7c70bd93a5 Mon Sep 17 00:00:00 2001
From: Jared Ballou <github@jballou.com>
Date: Tue, 19 Jan 2016 01:10:09 -0500
Subject: [PATCH] Renamed games to gamedata to more accurately reflect the
 purpose

---
 Insurgency/insserver       | 42 +++++-------------------------
 functions/game_settings.sh |  4 +--
 games/_default             | 24 ------------------
 games/_srcds               | 52 --------------------------------------
 games/csgoserver           | 39 ----------------------------
 games/insserver            | 17 -------------
 6 files changed, 8 insertions(+), 170 deletions(-)
 delete mode 100644 games/_default
 delete mode 100644 games/_srcds
 delete mode 100644 games/csgoserver
 delete mode 100644 games/insserver

diff --git a/Insurgency/insserver b/Insurgency/insserver
index b3f12cc1a..5e022c708 100755
--- a/Insurgency/insserver
+++ b/Insurgency/insserver
@@ -26,12 +26,12 @@ servicename="$(basename $0)"
 
 # Script root
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# LGSM Support Files
+# LGSM Support Files - set ro rootdir for old behavior
 lgsmdir="${rootdir}/lgsm"
 # Temporary path to store and manipulate settings
 settingsdir="${lgsmdir}/settings.tmp"
 # Supported Game Data
-gamesdir="${lgsmdir}/games"
+gamedatadir="${lgsmdir}/cfg/gamedata"
 # Config path for local instances
 scriptcfgdir="${lgsmdir}/cfg/servers"
 
@@ -113,34 +113,6 @@ fn_getgithubfile(){
 	fi
 }
 
-#### Advanced Variables ####
-# Directories
-lockselfname=".${servicename}.lock"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}/${game}"
-executabledir="${filesdir}"
-executable="./srcds_linux"
-servercfg="${servicename}.cfg"
-servercfgdir="${systemdir}/cfg"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/lgsm-default.cfg"
-backupdir="${lgsmdir}/backups"
-
-#In the event that you have library issues after an update, this may resolve it.
-#export LD_LIBRARY_PATH="${filesdir}:${filesdir}/bin:${LD_LIBRARY_PATH}"
-
-# Logging
-gamelogdir="${systemdir}/logs"
-scriptlogdir="${lgsmdir}/log/script"
-consolelogdir="${lgsmdir}/log/console"
-
-scriptlog="${scriptlogdir}/${servicename}-script.log"
-consolelog="${consolelogdir}/${servicename}-console.log"
-emaillog="${scriptlogdir}/${servicename}-email.log"
-
-scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log"
-
 # fn_runfunction
 fn_runfunction(){
 	scriptfile=${1:-$functionfile}
@@ -148,14 +120,12 @@ fn_runfunction(){
 	fn_getgithubfile "functions/${functionfile}" 1
 }
 
-# core_functions.sh
-#core_functions.sh(){
-#	# Functions are defined in core_functions.sh.
-#	fn_runfunction "${FUNCNAME}"
-#}
-
+# Process game configs and load variables needed to run script
 fn_runfunction game_settings.sh
+
+# Load core functions
 fn_runfunction core_functions.sh
 
+# Get option from command line and run option parser
 getopt=$1
 core_getopt.sh
diff --git a/functions/game_settings.sh b/functions/game_settings.sh
index fd95bbce6..8f2b4b468 100644
--- a/functions/game_settings.sh
+++ b/functions/game_settings.sh
@@ -100,9 +100,9 @@ fn_flush_game_settings(){
 }
 
 fn_import_game_settings(){
-	import="${gamesdir}/${1}"
+	import="${gamedatadir}/${1}"
 	if [ ! -e $import ]; then
-		fn_getgithubfile "games/${1}"
+		fn_getgithubfile "gamedata/${1}"
 	fi
 	source $import
 }
diff --git a/games/_default b/games/_default
deleted file mode 100644
index 94e2b7de6..000000000
--- a/games/_default
+++ /dev/null
@@ -1,24 +0,0 @@
-# Game Settings File
-# _default
-# Base defaults for all games
-
-# Set the default settings for the script
-fn_set_game_params settings "email" "email@example.com" "Email address for notification"
-fn_set_game_params settings "emailnotification" "off" "Email notification (on|off)"
-fn_set_game_params settings "ip" "0.0.0.0" "IP Address to bind for server"
-fn_set_game_params settings "lgsm_version" "${version}" "Version of LGSM that created this config"
-fn_set_game_params settings "logdays" "7" "Number of days to retain logs"
-fn_set_game_params settings "updateonstart" "off" "Update game on start"
-
-
-
-fn_set_game_params settings "lockselfname" ".\${servicename}.lock" "LGSM Lock File"
-fn_set_game_params settings "filesdir" "\${rootdir}/serverfiles" "Server Files Directory"
-fn_set_game_params settings "backupdir" "\${lgsmdir}/backups" "Backup Directory"
-fn_set_game_params settings "scriptlogdir" "\${lgsmdir}/log/script" "Script Log Dir"
-fn_set_game_params settings "consolelogdir" "\${lgsmdir}/log/console" "Console Log Dir"
-fn_set_game_params settings "scriptlog" "\${scriptlogdir}/\${servicename}-script.log" "Script Log"
-fn_set_game_params settings "consolelog" "\${consolelogdir}/\${servicename}-console.log" "Console Log"
-fn_set_game_params settings "emaillog" "\${scriptlogdir}/\${servicename}-email.log" "Email Log"
-fn_set_game_params settings "scriptlogdate" "\${scriptlogdir}/\${servicename}-script-\$(date '+%d-%m-%Y-%H-%M-%S').log" "Script Log Rotation Filename"
-fn_set_game_params settings "consolelogdate" "\${consolelogdir}/\${servicename}-console-\$(date '+%d-%m-%Y-%H-%M-%S').log" "Console Log Rotation Filename"
diff --git a/games/_srcds b/games/_srcds
deleted file mode 100644
index 25115cee8..000000000
--- a/games/_srcds
+++ /dev/null
@@ -1,52 +0,0 @@
-# Game Settings File
-# _srcds
-# Base SRCDS Game
-
-# Import default settings
-fn_import_game_settings _default
-
-# This is the way we create a script that collates and parses the parameters
-fn_parms(){
-	parms="$(echo $(sed -e 's/=\"/ /g' -e 's/\"$//g' ${settingsdir}/parms_minus)) ${srcds_parms} $(echo $(sed -e 's/=\"/ /g' -e 's/\"$//g' ${settingsdir}/parms_plus))"
-}
-# The parms that start with - go first
-fn_set_game_params parms_minus "-game" "\${game}"
-fn_set_game_params parms_minus "-strictportbind" "--EMPTY--"
-fn_set_game_params parms_minus "-ip" "\${ip}"
-fn_set_game_params parms_minus "-port" "\${port}"
-fn_set_game_params parms_minus "-maxplayers" "\${maxplayers}"
-
-# Then the parms that start with +
-fn_set_game_params parms_plus "+clientport" "\${clientport}"
-fn_set_game_params parms_plus "+tv_port" "\${sourcetvport}"
-fn_set_game_params parms_plus "+mapcyclefile" "\${mapcyclefile}"
-fn_set_game_params parms_plus "+servercfgfile" "\${servercfg}"
-fn_set_game_params parms_plus "+map" "\${defaultmap}"
-
-# And the settings for defaults
-fn_set_game_params settings "appid" "204" "Steam App ID"
-fn_set_game_params settings "clientport" "27005" "Client Port"
-fn_set_game_params settings "defaultmap" "dm_lockdown" "Default map to load"
-fn_set_game_params settings "engine" "source" "Game Engine"
-fn_set_game_params settings "game" "hl2mp" "Name of game to pass to srcds"
-fn_set_game_params settings "gamename" "HalfLife2Deathmatch" "Name for subdirectory in GitHub repo"
-fn_set_game_params settings "mapcyclefile" "mapcycle.txt" "Map Cycle File"
-fn_set_game_params settings "maxplayers" "64" "Maximum player count"
-fn_set_game_params settings "playlist" "custom" "Playlist"
-fn_set_game_params settings "port" "27015" "Port to bind for server"
-fn_set_game_params settings "servercfg" "${selfname}.cfg" "Server Config file"
-fn_set_game_params settings "sourcetvport" "27020" "SourceTV Port"
-fn_set_game_params settings "srcds_parms" "--EMPTY--" "Additional SRCDS Parameters. Put the parameters that start with \"-\" first, then \"+\" parameters after"
-fn_set_game_params settings "steampass" "--EMPTY--" "Steam Password"
-fn_set_game_params settings "steamuser" "anonymous" "Steam Username"
-
-
-fn_set_game_params settings "systemdir" "\${filesdir}/\${game}"
-fn_set_game_params settings "gamelogdir" "\${systemdir}/logs"
-fn_set_game_params settings "executabledir" "\${filesdir}"
-fn_set_game_params settings "executable" "./srcds_linux"
-fn_set_game_params settings "servercfg" "\${servicename}.cfg"
-fn_set_game_params settings "servercfgdir" "\${systemdir}/cfg"
-fn_set_game_params settings "servercfgfullpath" "\${servercfgdir}/\${servercfg}"
-fn_set_game_params settings "servercfgdefault" "\${servercfgdir}/lgsm-default.cfg"
-
diff --git a/games/csgoserver b/games/csgoserver
deleted file mode 100644
index afe9dab63..000000000
--- a/games/csgoserver
+++ /dev/null
@@ -1,39 +0,0 @@
-# Game Settings File
-# csgoserver
-# Counter-Strike: Global Offensive Dedicated Server
-
-# Import SRCDS
-fn_import_game_settings _srcds
-
-# Add playlist parameter
-fn_set_game_params parms_plus "+sv_playlist" "\${playlist}"
-
-# Override some server settings
-fn_set_game_params settings "appid" "740"
-fn_set_game_params settings "defaultmap" "de_dust2"
-fn_set_game_params settings "game" "csgo"
-fn_set_game_params settings "mapcyclefile" "--UNSET--"
-fn_set_game_params settings "gamename" "Counter Strike: Global Offensive"
-fn_set_game_params settings "mapgroup" "random_classic" "Map Group. See https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server"
-fn_set_game_params settings "tickrate" "64" "Server Tick Rate"
-fn_set_game_params settings "gametype" "0" "Game Type. Set to: Arms Race 1 Classic Casual 0 Classic Competitive 0 Demolition 1 Deathmatch 1"
-fn_set_game_params settings "gamemode" "0" "Game Mode. Set to: Arms Race 0 Classic Casual 0 Classic Competitive 1 Demolition 1 Deathmatch 2"
-fn_set_game_params settings "gslt" "--EMPTY--" "Required: Game Server Login Token. GSLT is required for running a public server. More info: http://gameservermanagers.com/gslt"
-fn_set_game_params settings "authkey" "--EMPTY--" "Optional key for Workshop Content.  See https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators - To get an authkey visit - http://steamcommunity.com/dev/apikey"
-fn_set_game_params settings "ws_collection_id" "--EMPTY--" "Workshop Collection ID"
-fn_set_game_params settings "ws_start_map" "--EMPTY--" "Workshop Start Map"
-
-
-# The parms that start with - go first
-fn_set_game_params parms_minus "-usercon" "--EMPTY--"
-fn_set_game_params parms_minus "-tickrate" "\${tickrate}"
-fn_set_game_params parms_minus "-maxplayers_override" "\${maxplayers}"
-fn_set_game_params parms_minus "-authkey" "\${authkey}"
-
-# Then the parms that start with +
-fn_set_game_params parms_plus "+sv_setsteamaccount" "\${gslt}"
-fn_set_game_params parms_plus "+mapgroup" "\${mapgroup}"
-fn_set_game_params parms_plus "+game_mode" "\${gamemode}"
-fn_set_game_params parms_plus "+game_type" "\${gametype}"
-fn_set_game_params parms_plus "+host_workshop_collection" "\${ws_collection_id}"
-fn_set_game_params parms_plus "+workshop_start_map" "\${ws_start_map}"
diff --git a/games/insserver b/games/insserver
deleted file mode 100644
index c2dde4f3b..000000000
--- a/games/insserver
+++ /dev/null
@@ -1,17 +0,0 @@
-# Game Settings File
-# insserver
-# Insurgency Dedicated Server
-
-# Import SRCDS
-fn_import_game_settings _srcds
-
-# Add playlist parameter
-fn_set_game_params parms_plus "+sv_playlist" "\${playlist}"
-
-# Override some server settings
-fn_set_game_params settings "appid" "237410"
-fn_set_game_params settings "defaultmap" "ministry checkpoint"
-fn_set_game_params settings "game" "insurgency"
-fn_set_game_params settings "mapcyclefile" "mapcycle.txt"
-fn_set_game_params settings "playlist" "custom" "Server Playlist"
-fn_set_game_params settings "gamename" "Insurgency"