From 458ea8ffdf9c0aba2a4cb1a58a7bc778c44e48c9 Mon Sep 17 00:00:00 2001
From: GhoulofGSG9 <ghoulofgsg9@gmail.com>
Date: Fri, 5 Aug 2016 20:19:25 +0200
Subject: [PATCH 1/2] Fixed that the steam branch parameter wasn't used in
 various places.

---
 lgsm/functions/command_validate.sh     | 4 ++--
 lgsm/functions/install_server_files.sh | 6 +++---
 lgsm/functions/update_steamcmd.sh      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh
index 948b11ee3..65b68dad5 100644
--- a/lgsm/functions/command_validate.sh
+++ b/lgsm/functions/command_validate.sh
@@ -24,9 +24,9 @@ fn_validation(){
 	fi
 
 	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}"
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}"
 	else
-		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" validate +quit| tee -a "${scriptlog}"
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} validate +quit| tee -a "${scriptlog}"
 	fi
 	if [ $? != 0 ]; then
 		fn_print_fail_nl "Validating files: SteamCMD"
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index 946b1c6d9..8f05a01a8 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -56,7 +56,7 @@ fn_install_server_files_steamcmd(){
 					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit
 					local exitcode=$?
 				else
-					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit
+					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit
 					local exitcode=$?
 				fi
 			elif [ "${counter}" -ge "5" ]; then
@@ -64,7 +64,7 @@ fn_install_server_files_steamcmd(){
 					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} -validate +quit
 					local exitcode=$?
 				else
-					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit
+					${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} -validate +quit
 					local exitcode=$?
 				fi
 			fi
@@ -82,7 +82,7 @@ fn_install_server_files_steamcmd(){
 		counter="0"
 		while [ "${counter}" -le "4" ]; do
 			counter=$((counter+1))
-			${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" -validate +quit
+			${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} -validate +quit
 			local exitcode=$?
 		done
 	fi
diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
index 5a097aaaf..574fbe2b9 100644
--- a/lgsm/functions/update_steamcmd.sh
+++ b/lgsm/functions/update_steamcmd.sh
@@ -24,9 +24,9 @@ fn_update_steamcmd_dl(){
 	fi
 
 	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}"
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}"
 	else
-		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit | tee -a "${scriptlog}"
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" ${branch} +quit | tee -a "${scriptlog}"
 	fi
 
 	fix.sh

From 9abe209f6155b32c00e6c992c4b34d611f7906a9 Mon Sep 17 00:00:00 2001
From: GhoulofGSG9 <ghoulofgsg9@gmail.com>
Date: Fri, 5 Aug 2016 20:26:54 +0200
Subject: [PATCH 2/2] Added the branch parameter to game script with popular
 branches

---
 CounterStrikeGlobalOffensive/csgoserver | 5 +++++
 GarrysMod/gmodserver                    | 5 +++++
 NaturalSelection2/ns2server             | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index 6dd95fcb7..413f896a0 100755
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -78,6 +78,11 @@ githubbranch="master"
 # Steam
 appid="740"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta 1.35.4.4"
+branch=""
+
 # Server Details
 servicename="csgo-server"
 gamename="Counter Strike: Global Offensive"
diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver
index e15fcf4e5..9eb3be966 100644
--- a/GarrysMod/gmodserver
+++ b/GarrysMod/gmodserver
@@ -29,6 +29,11 @@ pushbullettoken="accesstoken"
 steamuser="anonymous"
 steampass=""
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease "
+branch=""
+
 # Workshop Variables
 # http://wiki.garrysmod.com/page/Workshop_for_Dedicated_Servers
 workshopauth=""
diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server
index 70f4e7fd5..3c1cc3186 100644
--- a/NaturalSelection2/ns2server
+++ b/NaturalSelection2/ns2server
@@ -62,6 +62,11 @@ githubbranch="master"
 # Steam
 appid="4940"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ns2-server"
 gamename="Natural Selection 2"