From 1db661be4bcd422cfec0b225cb9af437301e7e09 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 18 May 2017 00:11:08 +0100
Subject: [PATCH] renamed filesdir to serverfiles

---
 lgsm/config-default/config-lgsm/bb2server/_default.cfg |  6 +++---
 .../config-lgsm/bf1942server/_default.cfg              |  6 +++---
 .../config-default/config-lgsm/bmdmserver/_default.cfg |  6 +++---
 lgsm/config-default/config-lgsm/boserver/_default.cfg  |  6 +++---
 lgsm/config-default/config-lgsm/bsserver/_default.cfg  |  6 +++---
 lgsm/config-default/config-lgsm/ccserver/_default.cfg  |  6 +++---
 .../config-default/config-lgsm/cod2server/_default.cfg | 10 +++++-----
 .../config-default/config-lgsm/cod4server/_default.cfg | 10 +++++-----
 lgsm/config-default/config-lgsm/codserver/_default.cfg |  8 ++++----
 .../config-lgsm/coduoserver/_default.cfg               | 10 +++++-----
 .../config-lgsm/codwawserver/_default.cfg              | 10 +++++-----
 lgsm/config-default/config-lgsm/coserver/_default.cfg  |  6 +++---
 lgsm/config-default/config-lgsm/csserver/_default.cfg  |  6 +++---
 lgsm/functions/command_dev_detect_deps.sh              |  6 +++---
 lgsm/functions/install_logs.sh                         |  8 ++++----
 lgsm/functions/install_server_files.sh                 |  4 ++--
 16 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/bb2server/_default.cfg b/lgsm/config-default/config-lgsm/bb2server/_default.cfg
index ca24739e7..5e31e6304 100644
--- a/lgsm/config-default/config-lgsm/bb2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bb2server/_default.cfg
@@ -88,11 +88,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/brainbread2"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/brainbread2"
+executabledir="${serverfiles}"
 executable="./srcds_run"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
index a1fd9189c..05ac58284 100644
--- a/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bf1942server/_default.cfg
@@ -68,10 +68,10 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
+systemdir="${serverfiles}"
 executabledir="${systemdir}"
 executable="./start.sh"
 servercfg="serversettings.con"
@@ -84,7 +84,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
index a54c2b910..d4c669c82 100644
--- a/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
@@ -88,11 +88,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/bms"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/bms"
+executabledir="${serverfiles}"
 executable="./srcds_run"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/config-default/config-lgsm/boserver/_default.cfg b/lgsm/config-default/config-lgsm/boserver/_default.cfg
index 32251d5ee..267e71cbd 100644
--- a/lgsm/config-default/config-lgsm/boserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/boserver/_default.cfg
@@ -80,11 +80,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./BODS.x86"
 servercfg="${servicename}.txt"
 servercfgdefault="config.txt"
diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
index 234b2dba0..5f745f8ab 100644
--- a/lgsm/config-default/config-lgsm/bsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
@@ -87,11 +87,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/berimbau"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/berimbau"
+executabledir="${serverfiles}"
 executable="./srcds_run.sh"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/config-default/config-lgsm/ccserver/_default.cfg b/lgsm/config-default/config-lgsm/ccserver/_default.cfg
index 994ee8d8d..81dff0aa9 100644
--- a/lgsm/config-default/config-lgsm/ccserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ccserver/_default.cfg
@@ -83,11 +83,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/cure"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/cure"
+executabledir="${serverfiles}"
 executable="./srcds_run"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/config-default/config-lgsm/cod2server/_default.cfg b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
index 6fdaa8aaf..c3b731df1 100644
--- a/lgsm/config-default/config-lgsm/cod2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod2server/_default.cfg
@@ -16,7 +16,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -70,11 +70,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./cod2_lnxded"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
@@ -86,7 +86,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/cod4server/_default.cfg b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
index b992b08ed..a45271e22 100644
--- a/lgsm/config-default/config-lgsm/cod4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/cod4server/_default.cfg
@@ -16,7 +16,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -70,11 +70,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./cod4x18_dedrun"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
@@ -86,7 +86,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/codserver/_default.cfg b/lgsm/config-default/config-lgsm/codserver/_default.cfg
index 5f6de5d88..ddb47ef23 100644
--- a/lgsm/config-default/config-lgsm/codserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codserver/_default.cfg
@@ -16,7 +16,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -53,8 +53,8 @@ engine="idtech3"
 # Edit with care
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./cod_lnxded"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
@@ -66,7 +66,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
index 06e82f46a..3255a26f4 100644
--- a/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/coduoserver/_default.cfg
@@ -16,7 +16,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -70,11 +70,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./coduo_lnxded"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
@@ -86,7 +86,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
index dfef61085..d55129dab 100644
--- a/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/codwawserver/_default.cfg
@@ -16,7 +16,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="+set sv_punkbuster 0 +set fs_basepath ${filesdir} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
+parms="+set sv_punkbuster 0 +set fs_basepath ${serverfiles} +set dedicated 1 +set net_ip ${ip} +set net_port ${port} +set sv_maxclients ${maxclients} +exec ${servercfg} +map ${defaultmap}"
 }
 
 #### LinuxGSM Settings ####
@@ -70,11 +70,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}"
-executabledir="${filesdir}"
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
 executable="./codwaw_lnxded"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
@@ -86,7 +86,7 @@ backupdir="${rootdir}/backups"
 
 ## Logging Directories
 logdir="${rootdir}/log"
-gamelogdir="${filesdir}/Logs"
+gamelogdir="${serverfiles}/Logs"
 lgsmlogdir="${logdir}/script"
 consolelogdir="${logdir}/console"
 lgsmlog="${lgsmlogdir}/${servicename}-script.log"
diff --git a/lgsm/config-default/config-lgsm/coserver/_default.cfg b/lgsm/config-default/config-lgsm/coserver/_default.cfg
index b5d2b700a..4ca937e3c 100644
--- a/lgsm/config-default/config-lgsm/coserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/coserver/_default.cfg
@@ -111,11 +111,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/csco"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/csco"
+executabledir="${serverfiles}"
 executable="./srcds_run"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/config-default/config-lgsm/csserver/_default.cfg b/lgsm/config-default/config-lgsm/csserver/_default.cfg
index 34d147e03..ac42430a4 100644
--- a/lgsm/config-default/config-lgsm/csserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csserver/_default.cfg
@@ -83,11 +83,11 @@ lgsmdir="${rootdir}/lgsm"
 functionsdir="${lgsmdir}/functions"
 libdir="${lgsmdir}/lib"
 tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
+serverfiles="${rootdir}/serverfiles"
 
 ## Server Specific Directories
-systemdir="${filesdir}/cstrike"
-executabledir="${filesdir}"
+systemdir="${serverfiles}/cstrike"
+executabledir="${serverfiles}"
 executable="./hlds_run"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
diff --git a/lgsm/functions/command_dev_detect_deps.sh b/lgsm/functions/command_dev_detect_deps.sh
index 1ee46b238..5536f7bed 100644
--- a/lgsm/functions/command_dev_detect_deps.sh
+++ b/lgsm/functions/command_dev_detect_deps.sh
@@ -12,7 +12,7 @@ echo "================================="
 echo "Dependencies Checker"
 echo "================================="
 echo "Checking directory: "
-echo "${filesdir}"
+echo "${serverfiles}"
 if [ "$(command -v eu-readelf 2>/dev/null)" ]; then
 	readelf=eu-readelf
 elif [ "$(command -v readelf 2>/dev/null)" ]; then
@@ -20,8 +20,8 @@ elif [ "$(command -v readelf 2>/dev/null)" ]; then
 else
 	echo "readelf/eu-readelf not installed"
 fi
-files=$(find ${filesdir} | wc -l)
-find "${filesdir}" -type f -print0 |
+files=$(find ${serverfiles} | wc -l)
+find "${serverfiles}" -type f -print0 |
 while IFS= read -r -d $'\0' line; do
 	if [ "${readelf}" == "eu-readelf" ]; then
 		${readelf} -d "${line}" 2>/dev/null|grep NEEDED|awk '{ print $4 }'|sed 's/\[//g;s/\]//g' >> "${tmpdir}/.depdetect_readelf"
diff --git a/lgsm/functions/install_logs.sh b/lgsm/functions/install_logs.sh
index f7591af22..43e33d8d3 100644
--- a/lgsm/functions/install_logs.sh
+++ b/lgsm/functions/install_logs.sh
@@ -45,16 +45,16 @@ if [ -n "${consolelogdir}" ]; then
 	echo -ne "installing console log dir: ${consolelogdir}..."
 	mkdir -p "${consolelogdir}"
 	if [ $? -ne 0 ]; then
-	fn_print_fail_eol_nl
-	core_exit.sh
+		fn_print_fail_eol_nl
+		core_exit.sh
 	else
 		fn_print_ok_eol_nl
 	fi
 	echo -ne "creating console log: ${consolelog}..."
 	touch "${consolelog}"
 	if [ $? -ne 0 ]; then
-	fn_print_fail_eol_nl
-	core_exit.sh
+		fn_print_fail_eol_nl
+		core_exit.sh
 	else
 		fn_print_ok_eol_nl
 	fi
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index 84ca7264e..02692f9a2 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -85,7 +85,7 @@ fn_install_server_files_steamcmd(){
 					local exitcode=$?
 
 					if [ "${gamename}" == "Classic Offensive" ]; then
-						${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid_co}" ${branch} +quit
+						${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid_co}" ${branch} +quit
 						local exitcode=$?
 					fi
 				fi
@@ -98,7 +98,7 @@ fn_install_server_files_steamcmd(){
 					local exitcode=$?
 
 					if [ "${gamename}" == "Classic Offensive" ]; then
-						${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid_co}" ${branch} -validate +quit
+						${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid_co}" ${branch} -validate +quit
 						local exitcode=$?
 					fi
 				fi