From b8fad57f8a6eb0d43fcffab37cd4df01a64ec36a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 25 Jan 2014 17:23:15 +0000
Subject: [PATCH] Improved app manifest fix

---
 CounterStrike/appmanifest/appmanifest_10.acf  | 14 +++----
 CounterStrike/appmanifest/appmanifest_70.acf  | 15 ++++---
 CounterStrike/appmanifest/appmanifest_90.acf  | 20 ++++-----
 CounterStrike/csserver                        | 42 +++++++++++++------
 .../appmanifest/appmanifest_90.acf            | 32 --------------
 CounterStrikeConditionZero/csczserver         |  5 +--
 6 files changed, 56 insertions(+), 72 deletions(-)
 delete mode 100644 CounterStrikeConditionZero/appmanifest/appmanifest_90.acf

diff --git a/CounterStrike/appmanifest/appmanifest_10.acf b/CounterStrike/appmanifest/appmanifest_10.acf
index 7e0395a4a..9217b6129 100644
--- a/CounterStrike/appmanifest/appmanifest_10.acf
+++ b/CounterStrike/appmanifest/appmanifest_10.acf
@@ -1,22 +1,22 @@
 "AppState"
 {
-	"appid"		"10"
+	"AppID"		"10"
 	"Universe"		"1"
-	"StateFlags"		"68"
+	"StateFlags"		"1090"
 	"installdir"		"Half-Life"
-	"LastUpdated"		"1380661260"
+	"LastUpdated"		"0"
 	"UpdateResult"		"0"
-	"SizeOnDisk"		"292798406"
-	"buildid"		"100698"
+	"SizeOnDisk"		"0"
+	"buildid"		"0"
 	"LastOwner"		"0"
 	"BytesToDownload"		"0"
 	"BytesDownloaded"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
 	"UserConfig"
 	{
-		"betakey"		"beta"
 	}
 	"MountedDepots"
 	{
-		"11"		"2402119522546692832"
 	}
 }
diff --git a/CounterStrike/appmanifest/appmanifest_70.acf b/CounterStrike/appmanifest/appmanifest_70.acf
index 3bc3a2842..e5d6f2807 100644
--- a/CounterStrike/appmanifest/appmanifest_70.acf
+++ b/CounterStrike/appmanifest/appmanifest_70.acf
@@ -1,23 +1,22 @@
 "AppState"
 {
-	"appid"		"70"
+	"AppID"		"70"
 	"Universe"		"1"
-	"StateFlags"		"68"
+	"StateFlags"		"1090"
 	"installdir"		"Half-Life"
-	"LastUpdated"		"1380661261"
+	"LastUpdated"		"0"
 	"UpdateResult"		"0"
-	"SizeOnDisk"		"445330938"
-	"buildid"		"112490"
+	"SizeOnDisk"		"0"
+	"buildid"		"0"
 	"LastOwner"		"0"
 	"BytesToDownload"		"0"
 	"BytesDownloaded"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
 	"UserConfig"
 	{
-		"betakey"		"beta"
 	}
 	"MountedDepots"
 	{
-		"1"		"5409401804038872403"
-		"71"		"1447090603169289057"
 	}
 }
diff --git a/CounterStrike/appmanifest/appmanifest_90.acf b/CounterStrike/appmanifest/appmanifest_90.acf
index c4a12b7a6..40b4773d1 100644
--- a/CounterStrike/appmanifest/appmanifest_90.acf
+++ b/CounterStrike/appmanifest/appmanifest_90.acf
@@ -1,23 +1,23 @@
 "AppState"
 {
-	"appid"		"90"
+	"AppID"		"90"
 	"Universe"		"1"
-	"StateFlags"		"4"
+	"StateFlags"		"1026"
 	"installdir"		"Half-Life"
-	"LastUpdated"		"1380661261"
+	"LastUpdated"		"0"
 	"UpdateResult"		"0"
-	"SizeOnDisk"		"41588635"
-	"buildid"		"100666"
-	"LastOwner"		"76561199992617988"
-	"BytesToDownload"		"5145424"
-	"BytesDownloaded"		"5145424"
+	"SizeOnDisk"		"0"
+	"buildid"		"0"
+	"LastOwner"		"76561200936454188"
+	"BytesToDownload"		"419436096"
+	"BytesDownloaded"		"0"
+	"AutoUpdateBehavior"		"0"
+	"AllowOtherDownloadsWhileRunning"		"0"
 	"UserConfig"
 	{
-		"betakey"		"beta"
 	}
 	"MountedDepots"
 	{
-		"4"		"3241770180922475775"
 	}
 	"SharedDepots"
 	{
diff --git a/CounterStrike/csserver b/CounterStrike/csserver
index 697d2eb57..c86a0679a 100644
--- a/CounterStrike/csserver
+++ b/CounterStrike/csserver
@@ -30,7 +30,7 @@ parms="-game cstrike +map ${defaultmap} -strictportbind -ip ${ip} -port ${port}
 #### Advanced Variables ####
 
 # Steam
-appid="90 -beta beta"
+appid="90"
 
 # Server Details
 servicename="cs-server"
@@ -554,15 +554,24 @@ echo ""
 #
 
 fn_csappmanifest(){
-echo "Downloading appmanifest files (app 90 fix)"
-echo "================================="
-sleep 1
-mkdir -v "${filesdir}/ec5da605084840d3d7b3ed355e48c098b28a1bd5"
-cd "${filesdir}/ec5da605084840d3d7b3ed355e48c098b28a1bd5"
-wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_10.acf
-wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_70.acf
-wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_90.acf
-echo ""
+appdir="${filesdir}/ec5da605084840d3d7b3ed355e48c098b28a1bd5"
+if [ ${pass} == 1 ]; then
+	echo "Creating appmanifest directory. (app 90 fix)"
+	sleep 2
+	mkdir -v "${filesdir}"
+	mkdir -v "${appdir}"
+	cd "${appdir}"
+	echo "Removing any existing appmanifest files. (app 90 fix)"
+	sleep 2
+	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
+elif [ ${pass} == 2 ]; then
+	echo "Downloading firstpass appmanifest files. (app 90 fix)"
+	sleep 2
+	cd "${appdir}"
+	wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_10.acf
+	wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_70.acf
+	wget https://raw.github.com/dgibbs64/linuxgameservers/master/CounterStrike/appmanifest/appmanifest_90.acf
+fi
 }
 
 fn_header(){
@@ -598,12 +607,13 @@ echo ""
 }
 
 fn_steaminstall(){
-echo "Installing ${gamename} Server"
-echo "================================="
 sleep 1
 mkdir -pv "${filesdir}"
 cd "${rootdir}/steamcmd"
 STEAMEXE=steamcmd ./steamcmd.sh +login ${steamuser} ${steampass} +force_install_dir "${filesdir}" +app_update ${appid} validate +quit
+}
+
+fn_success(){
 echo ""
 echo "================================="
 while true; do
@@ -686,8 +696,16 @@ while true; do
 done
 fn_header
 fn_steamdl
+echo "Installing ${gamename} Server"
+echo "================================="
+pass=1
 fn_csappmanifest
+pass=2
+fn_csappmanifest
+fn_steaminstall
+fn_steaminstall
 fn_steaminstall
+fn_success
 fn_steamfix
 fn_loginstall
 echo "Configuring ${gamename} Server"
diff --git a/CounterStrikeConditionZero/appmanifest/appmanifest_90.acf b/CounterStrikeConditionZero/appmanifest/appmanifest_90.acf
deleted file mode 100644
index 2153cd261..000000000
--- a/CounterStrikeConditionZero/appmanifest/appmanifest_90.acf
+++ /dev/null
@@ -1,32 +0,0 @@
-"AppState"
-{
-	"appid"		"90"
-	"Universe"		"1"
-	"StateFlags"		"4"
-	"installdir"		"Half-Life"
-	"LastUpdated"		"1389012979"
-	"UpdateResult"		"0"
-	"SizeOnDisk"		"41588635"
-	"buildid"		"100666"
-	"LastOwner"		"76561200372854832"
-	"BytesToDownload"		"5145024"
-	"BytesDownloaded"		"5145024"
-	"AutoUpdateBehavior"		"0"
-	"AllowOtherDownloadsWhileRunning"		"0"
-	"FullValidateOnNextUpdate"		"1"
-	"UserConfig"
-	{
-		"mod"		"czero"
-	}
-	"MountedDepots"
-	{
-		"4"		"3241770180922475775"
-	}
-	"SharedDepots"
-	{
-		"1"		"70"
-		"11"		"10"
-		"71"		"70"
-		"81"		"80"
-	}
-}
diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver
index 222564c12..c39283063 100644
--- a/CounterStrikeConditionZero/csczserver
+++ b/CounterStrikeConditionZero/csczserver
@@ -30,7 +30,7 @@ parms="-game czero +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +c
 #### Advanced Variables ####
 
 # Steam
-appid="90 -beta beta +app_set_config 90 mod czero"
+appid="90 +app_set_config 90 mod czero"
 
 # Server Details
 servicename="cscz-server"
@@ -563,7 +563,7 @@ if [ ${pass} == 1 ]; then
 	cd "${appdir}"
 	echo "Removing any existing appmanifest files. (app 90 fix)"
 	sleep 2
-	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_90.acf
+	rm -f appmanifest_10.acf appmanifest_70.acf appmanifest_80.acf appmanifest_90.acf
 elif [ ${pass} == 2 ]; then
 	echo "Downloading firstpass appmanifest files. (app 90 fix)"
 	sleep 2
@@ -703,7 +703,6 @@ while true; do
 done
 fn_header
 fn_steamdl
-
 echo "Installing ${gamename} Server"
 echo "================================="
 pass=1