From d0194138109c840dd9f37a8a112321dfbbf02aa4 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 11 Jan 2015 11:56:54 +0000
Subject: [PATCH] Installer loops better on failure

The installer will do the following on an issue downloading the server
files in an attempt to fix the problem.
# Attempt 1-4: Standard attempt
# Attempt 5-6: Validate attempt
# Attempt 7-8: Validate, delete long name dir
# Attempt 9-10: Validate, delete long name dir, re-download SteamCMD
# Attempt 11: Failure

All goldsrc files will run a validate multiple times as well to reduce
the chance of the files not downloading due to a bug in steamCMD.

Fixed the server looping when it shouldnt
---
 functions/fn_steaminstall | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/functions/fn_steaminstall b/functions/fn_steaminstall
index fb3f91e0e..e56b2805d 100644
--- a/functions/fn_steaminstall
+++ b/functions/fn_steaminstall
@@ -2,23 +2,52 @@
 # LGSM fn_steaminstall function
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
-# Version: 060115
+# Version: 110115
 
 fn_steaminstallcommand(){
 counter="0"
 while [ "${counter}" == "0" ]||[ "$(grep -wc 0x402 .fn_steaminstall.tmp)" -ge "1" ]||[ "$(grep -wc 0x406 .fn_steaminstall.tmp)" -ge "1" ]||[ "$(grep -wc 0x6 .fn_steaminstall.tmp)" -ge "1" ]||[ "$(grep -wc 0x106 .fn_steaminstall.tmp)" -ge "1" ]; do
 	counter=$((counter+1))
 	if [ "${counter}" -le "10" ]; then
+		# Attempt 1-4: Standard attempt
+		# Attempt 5-6: Validate attempt
+		# Attempt 7-8: Validate, delete long name dir
+		# Attempt 9-10: Validate, delete long name dir, re-download SteamCMD
+		# Attempt 11: Failure
+
 		if [ "${counter}" -ge "2" ]; then
-			fn_printwarningnl "SteamCMD did not complete the download, retrying: Attempt ${counter}"
+			fn_printwarningnl "SteamCMD did not complete the download, retrying: Attempt ${counter}:"
+		fi
+
+		if [ "${counter}" -ge "7" ]; then
+			echo "Removing $(find ${filesdir} -type d -print0 | grep -Ez '[^/]{30}$')"
+			find ${filesdir} -type d -print0 | grep -Ez '[^/]{30}$' | xargs -0 rm -rf
+		fi
+		if [ "${counter}" -ge "9" ]; then
+			rm -rf "${rootdir}/steamcmd"
+			fn_steamdl
+		fi
+		if [ "${counter}" -le "4" ]; then
+			./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit |tee .fn_steaminstall.tmp
+		elif [ "${counter}" -ge "5" ]; then
+			./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit |tee .fn_steaminstall.tmp
 		fi
-		./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit |tee .fn_steaminstall.tmp
 	elif [ "${counter}" -ge "11" ]; then
 		fn_printfailurenl "SteamCMD did not complete the download, too many retrys"
 		break
 	fi
-	echo "0x402" > .fn_steaminstall.tmp
+
 done
+
+# Goldsource servers commonly fail to download all the server files required.
+# Validating a few of times may reduce the chance of this issue.
+if [ "${engine}" == "goldsource" ]; then
+	counter="0"
+	while [ "${counter}" <= "4" ]; do
+		counter=$((counter+1))
+		./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit |tee .fn_steaminstall.tmp
+	done
+fi
 rm -f .fn_steaminstall.tmp
 }