goldsource issue #438

Improvements to reliability of server downloads.

CounterStrike/csserver

@@ -32,7 +32,8 @@ parms="-game cstrike -strictportbind -ip ${ip} -port ${port} +clientport ${clien
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod cstrike"
+appid="90"
+appidmod="cstrike"
 
 # Server Details
 servicename="cs-server"

CounterStrikeConditionZero/csczserver

@@ -32,7 +32,8 @@ parms="-game czero -strictportbind -ip ${ip} -port ${port} +clientport ${clientp
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod czero"
+appid="90"
+appidmod="czero"
 
 # Server Details
 servicename="cscz-server"

DayOfDefeat/dodserver

@@ -32,7 +32,8 @@ parms="-game dod -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod dod"
+appid="90"
+appidmod="dod"
 
 # Server Details
 servicename="dod-server"

DeathmatchClassic/dmcserver

@@ -32,7 +32,8 @@ parms="-game dmc -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod dmc"
+appid="90"
+appidmod="dmc"
 
 # Server Details
 servicename="dmc-server"

OpposingForce/opforserver

@@ -32,7 +32,8 @@ parms="-game gearbox -strictportbind -ip ${ip} -port ${port} +clientport ${clien
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod gearbox"
+appid="90"
+appidmod="gearbox"
 
 # Server Details
 servicename="opfor-server"

Ricochet/ricochetserver

@@ -32,7 +32,8 @@ parms="-game ricochet -strictportbind -ip ${ip} -port ${port} +clientport ${clie
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod ricochet"
+appid="90"
+appidmod="ricochet"
 
 # Server Details
 servicename="ricochet-server"

TeamFortressClassic/tfcserver

@@ -32,7 +32,8 @@ parms="-game tfc -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor
 #### Advanced Variables ####
 
 # Steam
-appid="90 +app_set_config 90 mod tfc"
+appid="90"
+appidmos="tfc"
 
 # Server Details
 servicename="tfc-server"

functions/fn_install_serverfiles

@@ -2,7 +2,7 @@
 # LGSM fn_install_serverfiles function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 030615
+# Version: 040715
 
 fn_steaminstallcommand(){
 fn_check_steamuser
@@ -36,9 +36,17 @@ while [ "${counter}" == "0" ]||[ "$(grep -wc 0x402 .fn_install_serverfiles.tmp)"
 		fi
 
 		if [ "${counter}" -le "4" ]; then
-			${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit |tee .fn_install_serverfiles.tmp
+			if [ "${engine}" == "goldsource" ]; then
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" +quit |tee .fn_install_serverfiles.tmp
+			else
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit |tee .fn_install_serverfiles.tmp
+			fi
 		elif [ "${counter}" -ge "5" ]; then
-			${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit |tee .fn_install_serverfiles.tmp
+			if [ "${engine}" == "goldsource" ]; then
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" -validate +quit |tee .fn_install_serverfiles.tmp
+			else
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit |tee .fn_install_serverfiles.tmp
+			fi
 		fi
 	elif [ "${counter}" -ge "11" ]; then
 		fn_printfailurenl "SteamCMD did not complete the download, too many retrys"
@@ -53,7 +61,7 @@ if [ "${engine}" == "goldsource" ]; then
 	counter="0"
 	while [ "${counter}" -le "4" ]; do
 		counter=$((counter+1))
-		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit |tee .fn_install_serverfiles.tmp
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" -validate +quit |tee .fn_install_serverfiles.tmp
 	done
 fi
 rm -f .fn_install_serverfiles.tmp
@@ -77,4 +85,4 @@ if [ -z "${autoinstall}" ]; then
 			* ) echo "Please answer yes or no.";;
 		esac
 	done
-fi
+fi

functions/fn_update_dl

@@ -2,7 +2,7 @@
 # LGSM fn_update_dl function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 280515
+# Version: 040715
 
 # Description: Runs a server update.
 
@@ -25,7 +25,12 @@ if [ $(command -v unbuffer) ]; then
 	unbuffer=unbuffer
 fi
 
-${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit|tee -a "${scriptlog}"
+if [ "${engine}" == "goldsource" ]; then
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" +quit|tee -a "${scriptlog}"
+else
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit|tee -a "${scriptlog}"
+fi
+
 
 if [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
 	echo -e '\n'

functions/fn_validate

@@ -2,7 +2,7 @@
 # LGSM fn_validate function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 280515
+# Version: 040715
 
 # Description: Runs a server validation.
 
@@ -29,7 +29,12 @@ if [ $(command -v unbuffer) ]; then
 	unbuffer=unbuffer
 fi
 
-${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" validate +quit|tee -a "${scriptlog}"
+if [ "${engine}" == "goldsource" ]; then
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" +app_update "${appid}" validate +quit|tee -a "${scriptlog}"
+else
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" validate +quit|tee -a "${scriptlog}"
+fi
+
 if [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
 	echo -e '\n'
 	fn_csgofix