From 83180cc848672bc2d74539519dc7604d05ab297a Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Wed, 18 Oct 2017 19:25:07 +0200
Subject: [PATCH 01/56] Disabled Lua AutoRefresh

---
 lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
index a333bd06f..a47b73df7 100644
--- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
@@ -33,7 +33,7 @@ gslt=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${workshopcollectionid} -authkey ${workshopauth} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}"
+parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} -disableluarefresh +host_workshop_collection ${workshopcollectionid} -authkey ${workshopauth} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}"
 }
 
 #### LinuxGSM Settings ####

From 089c0f70cbbb11d109e8dc124403150d7fa29e85 Mon Sep 17 00:00:00 2001
From: Bourne-ID <Bourne-ID@users.noreply.github.com>
Date: Thu, 19 Oct 2017 17:15:21 +0100
Subject: [PATCH 02/56] Fix ARK dedicated server minimum RAM requirements

minor, was checking for 4GB but warning about 1GB.
---
 lgsm/functions/check_system_requirements.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/check_system_requirements.sh b/lgsm/functions/check_system_requirements.sh
index 02a43e1c0..0e1514814 100644
--- a/lgsm/functions/check_system_requirements.sh
+++ b/lgsm/functions/check_system_requirements.sh
@@ -14,7 +14,7 @@ info_distro.sh
 
 if [ "${gamename}" == "ARK: Survival Evolved" ]; then
 	ramrequirementmb="4000"
-	ramrequirementgb="1"
+	ramrequirementgb="4"
 elif [ "${gamename}" == "ARMA 3" ]; then
 	ramrequirementmb="1000"
 	ramrequirementgb="1"

From 483b0b54c10f64a21ecb4b2ded6c612e24cc6b35 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Thu, 19 Oct 2017 18:20:48 +0200
Subject: [PATCH 03/56] Moved -disableluarefresh to customparms

---
 lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
index a47b73df7..e35984540 100644
--- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
@@ -24,7 +24,8 @@ workshopcollectionid=""
 
 ## Custom Start Parameters
 # Default +r_hunkalloclightmaps 0, fixes a start issue on maps with many lights
-customparms="+r_hunkalloclightmaps 0"
+# Default -disableluarefresh, disables autorefresh which should only be used when developing to avoid unwanted behavior
+customparms="+r_hunkalloclightmaps 0 -disableluarefresh"
 
 ## Optional: Game Server Login Token
 # GSLT can be used for running a public server.
@@ -33,7 +34,7 @@ gslt=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} -disableluarefresh +host_workshop_collection ${workshopcollectionid} -authkey ${workshopauth} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}"
+parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${workshopcollectionid} -authkey ${workshopauth} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}"
 }
 
 #### LinuxGSM Settings ####

From f2200989cf0b6226089822635e44c06fef9c07e5 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 20 Oct 2017 20:12:30 +0200
Subject: [PATCH 04/56] Added custom gamemode info

and rearranged game mode table by category
---
 lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index 70eb7ed2b..ee006ea9c 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -11,11 +11,12 @@
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
 # [Game Modes]			gametype	gamemode
-# Arms Race				1			0
 # Classic Casual		0			0
 # Classic Competitive	0			1
+# Arms Race				1			0
 # Demolition			1			1
 # Deathmatch			1			2
+# Custom				3			0
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From f1d6714f2b709ff836cf71fe436e8618247e9342 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 20 Oct 2017 20:32:33 +0200
Subject: [PATCH 05/56] Allowed game name as possible argument for install and
 improved output

---
 linuxgsm.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 9dbc97b6a..0e6e3db30 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -229,9 +229,9 @@ fn_install_getopt(){
 	echo "https://gameservermanagers.com"
 	echo -e ""
 	echo -e "Commands"
-	echo -e "install |Select server to install."
-	echo -e "servername |e.g $0 csgoserver. Enter the required servername will install it."
-	echo -e "list |List all servers available for install."
+	echo -e "install\t\t|Select server to install."
+	echo -e "servername\t|e.g $0 csgoserver. Enter name of server/game to install."
+	echo -e "list\t\t|List all servers available for install."
 	exit
 }
 
@@ -307,8 +307,10 @@ if [ "${shortname}" == "core" ]; then
 		fi
 	elif [ -n "${userinput}" ]; then
 		fn_server_info
-		if [ "${userinput}" == "${gameservername}" ]; then
+		if [ "${userinput}" == "${gameservername}" ]||[ "${userinput}" == "${gamename}" ]||[ "${userinput}" == "${shortname}" ]; then
 			fn_install_file
+		else
+			echo "[ FAIL ] unknown game server"
 		fi
 	else
 		fn_install_getopt

From 89e4ee47e95e975eb4470038f74791c4ee312505 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 20 Oct 2017 22:06:56 +0200
Subject: [PATCH 06/56] Removed unsupported gslt

---
 lgsm/config-default/config-lgsm/zpsserver/_default.cfg | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg
index cb36c22a5..16988e663 100644
--- a/lgsm/config-default/config-lgsm/zpsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/zpsserver/_default.cfg
@@ -16,14 +16,9 @@ sourcetvport="27020"
 defaultmap="zps_deadend"
 maxplayers="20"
 
-## Optional: Game Server Login Token
-# GSLT can be used for running a public server.
-# More info: https://gameservermanagers.com/gslt
-gslt=""
-
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-game zps -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game zps -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
 
 #### LinuxGSM Settings ####
@@ -125,4 +120,4 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
 
 ## Logs Naming
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

From 6a21e9703b7feaebbe7c156ea12ef5142b7b6d4d Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Fri, 20 Oct 2017 23:06:14 +0200
Subject: [PATCH 07/56] Added spaces

---
 linuxgsm.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 0e6e3db30..dd2f8d734 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -229,9 +229,9 @@ fn_install_getopt(){
 	echo "https://gameservermanagers.com"
 	echo -e ""
 	echo -e "Commands"
-	echo -e "install\t\t|Select server to install."
-	echo -e "servername\t|e.g $0 csgoserver. Enter name of server/game to install."
-	echo -e "list\t\t|List all servers available for install."
+	echo -e "install\t\t| Select server to install."
+	echo -e "servername\t| e.g $0 csgoserver. Enter name of server/game to install."
+	echo -e "list\t\t| List all servers available for install."
 	exit
 }
 

From a4776e12c64fc6f9c176754ce23da2459236d396 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 11:52:25 +0200
Subject: [PATCH 08/56] Changed curl to ${curlpath}

---
 lgsm/functions/alert_mailgun.sh   | 2 +-
 lgsm/functions/info_distro.sh     | 2 +-
 lgsm/functions/update_factorio.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh
index b3f17d6b1..8f336687b 100644
--- a/lgsm/functions/alert_mailgun.sh
+++ b/lgsm/functions/alert_mailgun.sh
@@ -11,7 +11,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 fn_print_dots "Sending Email alert: Mailgun: ${email}"
 sleep 0.5
 
-mailgunsend=$(curl -s --user "api:${mailguntoken}" \
+mailgunsend=$(${curlpath} -s --user "api:${mailguntoken}" \
 -F from="LinuxGSM <${mailgunemailfrom}>" \
 -F to="LinuxGSM Admin <${mailgunemail}>" \
 -F subject="${alertemoji} ${alertsubject} ${alertemoji}" \
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index d23f58f36..661123a80 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -136,5 +136,5 @@ fi
 
 # External IP address
 if [ -z "${extip}" ];then
-	extip=$(curl -m 3 ifconfig.co 2>/dev/null)
+	extip=$(${curlpath} -m 3 ifconfig.co 2>/dev/null)
 fi
\ No newline at end of file
diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh
index 5948cedd3..9ff702479 100644
--- a/lgsm/functions/update_factorio.sh
+++ b/lgsm/functions/update_factorio.sh
@@ -76,7 +76,7 @@ fn_update_factorio_arch(){
 
 fn_update_factorio_availablebuild(){
 	# Gets latest build info.
-	availablebuild=$(curl -s https://www.factorio.com/download-headless/"${branch}" | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
+	availablebuild=$(${curlpath} -s https://www.factorio.com/download-headless/"${branch}" | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
 	sleep 1
 
 	# Checks if availablebuild variable has been set

From df8046fac6388d15bc4817ab8307c04cb48c646d Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 13:50:47 +0200
Subject: [PATCH 09/56] Removed wrong unnecessary parameter

local_filename = github_file_url_name (not $4)
---
 linuxgsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 9dbc97b6a..34aa77cb1 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -281,7 +281,7 @@ if [ "${shortname}" == "core" ]; then
 	if [ -f "${serverlist}" ]; then
 		rm "${serverlist}"
 	fi
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "serverlist.csv" "nochmodx" "norun" "noforcedl" "nomd5"
+	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "noforcedl" "nomd5"
 	if [ ! -f "${serverlist}" ]; then
 		echo "[ FAIL ] serverlist.csv could not be loaded."
 		exit 1

From ba37d6b797603b598bbb470a57c1ef04b53e0910 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 14:13:31 +0200
Subject: [PATCH 10/56] Fixed forcedl functionality

---
 lgsm/functions/core_dl.sh |  4 ++--
 linuxgsm.sh               | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index 0fb664521..2adb4bf08 100644
--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@@ -105,8 +105,8 @@ fn_fetch_file(){
 	forcedl="${6:-0}"
 	md5="${7:-0}"
 
-	# If the file is missing, then download
-	if [ ! -f "${local_filedir}/${local_filename}" ]; then
+	# download file if missing or download forced
+	if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then
 		if [ ! -d "${local_filedir}" ]; then
 			mkdir -p "${local_filedir}"
 		fi
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 34aa77cb1..5cf2f56dd 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -64,8 +64,8 @@ fn_bootstrap_fetch_file(){
 	run="${5:-0}"
 	forcedl="${6:-0}"
 	md5="${7:-0}"
-	# If the file is missing, then download
-	if [ ! -f "${local_filedir}/${local_filename}" ]; then
+	# download file if missing or download forced
+	if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then
 		if [ ! -d "${local_filedir}" ]; then
 			mkdir -p "${local_filedir}"
 		fi
@@ -116,15 +116,15 @@ fn_bootstrap_fetch_file_github(){
 	github_file_url_name="${2}"
 	githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
 
-	remote_remote_fileurl="${githuburl}"
-	local_local_filedir="${3}"
-	local_local_filename="${github_file_url_name}"
+	remote_fileurl="${githuburl}"
+	local_filedir="${3}"
+	local_filename="${github_file_url_name}"
 	chmodx="${4:-0}"
 	run="${5:-0}"
-	forcedldl="${6:-0}"
+	forcedl="${6:-0}"
 	md5="${7:-0}"
 	# Passes vars to the file download function
-	fn_bootstrap_fetch_file "${remote_remote_fileurl}" "${local_local_filedir}" "${local_local_filename}" "${chmodx}" "${run}" "${forcedldl}" "${md5}"
+	fn_bootstrap_fetch_file "${remote_fileurl}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}"
 }
 
 # Installer menu

From f030f2136bee9f4c403e7e986f21e4d19c5698b7 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 14:19:50 +0200
Subject: [PATCH 11/56] Forcing download instead of explicitly deleting old
 server list

---
 linuxgsm.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 5cf2f56dd..819a19222 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -276,12 +276,8 @@ if [ "${shortname}" == "core" ]; then
 	datadir="${tmpdir}/data"
 	serverlist="${datadir}/serverlist.csv"
 
-	# Download the serverlist. This is the complete list of all supported servers.
-
-	if [ -f "${serverlist}" ]; then
-		rm "${serverlist}"
-	fi
-	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "noforcedl" "nomd5"
+	# Download the latest serverlist. This is the complete list of all supported servers.
+	fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5"
 	if [ ! -f "${serverlist}" ]; then
 		echo "[ FAIL ] serverlist.csv could not be loaded."
 		exit 1

From 5b76ede9e0da6f66e13e461816dd1cbda99c5024 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 14:35:45 +0200
Subject: [PATCH 12/56] Forced game config download

otherwise old configs or configs from other games which have the same name like server.cfg will be mistakenly used.
---
 lgsm/functions/install_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 90a540d2f..ac67f31f1 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -27,7 +27,7 @@ fn_fetch_default_config(){
 	mkdir -p "${lgsmdir}/config-default/config-game"
 	githuburl="https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/master"
 	for config in "${array_configs[@]}"; do
-		fn_fetch_file "${githuburl}/${gamedirname}/${config}" "${lgsmdir}/config-default/config-game" "${config}" "nochmodx" "norun" "noforce" "nomd5"
+		fn_fetch_file "${githuburl}/${gamedirname}/${config}" "${lgsmdir}/config-default/config-game" "${config}" "nochmodx" "norun" "forcedl" "nomd5"
 	done
 }
 

From 4a7a411ecb8dbaa0d24d958ac406b1ba8ef74f64 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 18:27:00 +0200
Subject: [PATCH 13/56] Improved CS:GO fixes

---
 lgsm/functions/fix_csgo.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/fix_csgo.sh b/lgsm/functions/fix_csgo.sh
index 358da07b1..5eca2f6eb 100644
--- a/lgsm/functions/fix_csgo.sh
+++ b/lgsm/functions/fix_csgo.sh
@@ -17,19 +17,19 @@ if [ ! -f "${serverfiles}/steam_appid.txt" ]; then
 fi
 
 # Fixes: Error parsing BotProfile.db - unknown attribute 'Rank'".
-if ! grep -q "//Rank" "${systemdir}/botprofile.db" > /dev/null 2>&1; then
+if [ -f "${systemdir}/botprofile.db" ] && grep "^\s*Rank" "${systemdir}/botprofile.db" > /dev/null 2>&1; then
 	fixname="botprofile.db"
 	fn_fix_msg_start
-	sed -i 's/\tRank/\t\/\/Rank/g' "${systemdir}/botprofile.db" > /dev/null 2>&1
+	sed -i 's/\s*Rank/\t\/\/Rank/g' "${systemdir}/botprofile.db" > /dev/null 2>&1
 	fn_fix_msg_end
 fi
 
-# Fixes: Unknown command "cl_bobamt_vert".
-if ! grep -q "//exec default" "${servercfgdir}/valve.rc" > /dev/null 2>&1 || ! grep -q "//exec joystick" "${servercfgdir}/valve.rc" > /dev/null 2>&1; then
+# Fixes: Unknown command "cl_bobamt_vert" and exec: couldn't exec joystick.cfg.
+if [ -f "${servercfgdir}/valve.rc" ] && grep -E '^\s*exec\s*(default|joystick)\.cfg' "${servercfgdir}/valve.rc" > /dev/null 2>&1; then
 	fixname="valve.rc"
 	fn_fix_msg_start
-	sed -i 's/exec default.cfg/\/\/exec default.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1
-	sed -i 's/exec joystick.cfg/\/\/exec joystick.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1
+	sed -i 's/^\s*exec\s*default.cfg/\/\/exec default.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1
+	sed -i 's/^\s*exec\s*joystick.cfg/\/\/exec joystick.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1
 	fn_fix_msg_end
 fi
 
@@ -42,4 +42,4 @@ if [ -f "${systemdir}/subscribed_collection_ids.txt" ]||[ -f "${systemdir}/subsc
 	rm -f "${systemdir}/subscribed_file_ids.txt"
 	rm -f "${systemdir}/ugc_collection_cache.txt"
 	fn_fix_msg_end
-fi
\ No newline at end of file
+fi

From 7fbadeae9c275c66515d28c09c6e6b525c5f8de4 Mon Sep 17 00:00:00 2001
From: Marvin Lehmann <marvinlehmann@live.de>
Date: Sat, 21 Oct 2017 18:33:37 +0200
Subject: [PATCH 14/56] Improved RegEx for CS:GO fix

---
 lgsm/functions/fix_csgo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/fix_csgo.sh b/lgsm/functions/fix_csgo.sh
index 5eca2f6eb..f76a4f5d2 100644
--- a/lgsm/functions/fix_csgo.sh
+++ b/lgsm/functions/fix_csgo.sh
@@ -20,7 +20,7 @@ fi
 if [ -f "${systemdir}/botprofile.db" ] && grep "^\s*Rank" "${systemdir}/botprofile.db" > /dev/null 2>&1; then
 	fixname="botprofile.db"
 	fn_fix_msg_start
-	sed -i 's/\s*Rank/\t\/\/Rank/g' "${systemdir}/botprofile.db" > /dev/null 2>&1
+	sed -i 's/^\s*Rank/\t\/\/Rank/g' "${systemdir}/botprofile.db" > /dev/null 2>&1
 	fn_fix_msg_end
 fi
 

From 0bebe6fde7b6de4f4a361994cab8d8a5b4d55589 Mon Sep 17 00:00:00 2001
From: Bourne-ID <Bourne-ID@users.noreply.github.com>
Date: Mon, 6 Nov 2017 14:07:22 +0000
Subject: [PATCH 15/56] Fix #1681 - Oxide Seven Days file renamed

Oxide Seven Days To Die: Renamed Oxide-SevenDays.zip to Oxide-SevenDaysToDie.zip
---
 lgsm/functions/mods_list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh
index f7ad698fc..47131af69 100644
--- a/lgsm/functions/mods_list.sh
+++ b/lgsm/functions/mods_list.sh
@@ -68,7 +68,7 @@ mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "ht
 # Oxidemod
 mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Rust.zip" "Oxide-Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" )
 mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Hurtworld.zip" "Oxide-Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" )
-mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-SevenDays.zip" "Oxide-SevenDays.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" )
+mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-SevenDaysToDie.zip" "Oxide-SevenDaysToDie.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" )
 
 # REQUIRED: Set all mods info into the global array
 mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_sourcemod[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" )

From 14efacbdaca024630331468164fe57097cb46497 Mon Sep 17 00:00:00 2001
From: Casper <casper@billosoft.com>
Date: Sun, 19 Nov 2017 12:11:01 +0200
Subject: [PATCH 16/56] Changed the target-session of all tmux commands to use
 exact matching.

---
 lgsm/functions/command_console.sh | 2 +-
 lgsm/functions/command_start.sh   | 4 ++--
 lgsm/functions/command_stop.sh    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/command_console.sh b/lgsm/functions/command_console.sh
index c1f6fa875..10aa8f99c 100644
--- a/lgsm/functions/command_console.sh
+++ b/lgsm/functions/command_console.sh
@@ -30,7 +30,7 @@ if [ "${status}" != "0" ]; then
 	fn_print_ok_nl "Accessing console"
 	fn_script_log_pass "Console accessed"
 	sleep 1
-	tmux attach-session -t ${servicename}
+	tmux attach-session -t "=${servicename}"
 	fn_print_ok_nl "Closing console"
 	fn_script_log_pass "Console closed"
 else
diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh
index 6bad48141..20196c45a 100644
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@@ -110,7 +110,7 @@ fn_start_tmux(){
 		fn_script_log "Tmux version: master (user compiled)"
 		echo "Tmux version: master (user compiled)" >> "${consolelog}"
 		if [ "${consolelogging}" == "on" ]||[ -z "${consolelogging}" ]; then
-			tmux pipe-pane -o -t "${servicename}" "exec cat >> '${consolelog}'"
+			tmux pipe-pane -o -t "=${servicename}" "exec cat >> '${consolelog}'"
 		fi
 	elif [ -n "${tmuxversion}" ]; then
 		# Get the digit version of tmux
@@ -128,7 +128,7 @@ fn_start_tmux(){
 			Currently installed: $(tmux -V)" > "${consolelog}"
 		# Console logging enable or not set
 		elif [ "${consolelogging}" == "on" ]||[ -z "${consolelogging}" ]; then
-			tmux pipe-pane -o -t "${servicename}" "exec cat >> '${consolelog}'"
+			tmux pipe-pane -o -t "=${servicename}" "exec cat >> '${consolelog}'"
 		fi
 	else
 		echo "Unable to detect tmux version" >> "${consolelog}"
diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index f147508e0..9b76089af 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -14,7 +14,7 @@ fn_stop_graceful_ctrlc(){
 	fn_print_dots "Graceful: CTRL+c"
 	fn_script_log_info "Graceful: CTRL+c"
 	# sends quit
-	tmux send-keys C-c -t "${servicename}" > /dev/null 2>&1
+	tmux send-keys C-c -t "=${servicename}" > /dev/null 2>&1
 	# waits up to 30 seconds giving the server time to shutdown gracefuly
 	for seconds in {1..30}; do
 		check_status.sh
@@ -44,7 +44,7 @@ fn_stop_graceful_cmd(){
 	fn_print_dots "Graceful: sending \"${1}\""
 	fn_script_log_info "Graceful: sending \"${1}\""
 	# sends specific stop command
-	tmux send -t "${servicename}" ${1} ENTER > /dev/null 2>&1
+	tmux send -t "=${servicename}" ${1} ENTER > /dev/null 2>&1
 	# waits up to given seconds giving the server time to shutdown gracefully
 	for ((seconds=1; seconds<=${2}; seconds++)); do
 		check_status.sh
@@ -75,7 +75,7 @@ fn_stop_graceful_goldsource(){
 	fn_print_dots "Graceful: sending \"quit\""
 	fn_script_log_info "Graceful: sending \"quit\""
 	# sends quit
-	tmux send -t "${servicename}" quit ENTER > /dev/null 2>&1
+	tmux send -t "=${servicename}" quit ENTER > /dev/null 2>&1
 	# waits 3 seconds as goldsource servers restart with the quit command
 	for seconds in {1..3}; do
 		sleep 1
@@ -261,7 +261,7 @@ fn_stop_tmux(){
 	fn_script_log_info "tmux kill-session: ${servername}"
 	sleep 0.5
 	# Kill tmux session
-	tmux kill-session -t "${servicename}" > /dev/null 2>&1
+	tmux kill-session -t "=${servicename}" > /dev/null 2>&1
 	sleep 0.5
 	check_status.sh
 	if [ "${status}" == "0" ]; then

From d5ece9d0c4991a6026e9152556d37e6fdeedd23e Mon Sep 17 00:00:00 2001
From: Thomas Hawes <tchawes@gmail.com>
Date: Wed, 22 Nov 2017 01:44:52 -0500
Subject: [PATCH 17/56] Added support for Amazon Linux in check_deps.sh by
 explicitly setting a version of python and libstdc++.i686 if the distroname
 is Amazon.  In regards to issue #1368

---
 lgsm/functions/check_deps.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 4ea2295bc..0804f485d 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -235,6 +235,8 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 	# LinuxGSM requirements
 	if [ "${distroversion}" == "6" ]; then
 		array_deps_required=( curl wget util-linux-ng python file gzip bzip2 unzip binutils bc )
+	elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
+        	array_deps_required=( curl wget util-linux python27 file gzip bzip2 unzip binutils bc )
 	else
 		array_deps_required=( curl wget util-linux python file gzip bzip2 unzip binutils bc )
 	fi
@@ -250,7 +252,11 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686
 	if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${engine}" != "lwjgl2" ]&&[ "${engine}" != "renderware" ]; then
-		array_deps_required+=( glibc.i686 libstdc++.i686 )
+		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then		
+            		array_deps_required+=( glibc.i686 libstdc++64.i686 )
+        	else
+			array_deps_required+=( glibc.i686 libstdc++.i686 )
+		fi
 	fi
 
 	# Game Specific requirements

From 731b975c8b30a25d50398b1dbd494f951e62ef84 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sat, 25 Nov 2017 18:47:50 +0100
Subject: [PATCH 18/56] Ensures conditionalseed mechanics to work

---
 lgsm/config-default/config-lgsm/rustserver/_default.cfg | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
index 5a1c5fc04..a24932d8a 100644
--- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
@@ -26,9 +26,6 @@ tickrate="30" # default 30; range : 15 to 100
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-batchmode +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${servicename}\" ${conditionalseed} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile \"${gamelogdate}\""
-}
-
 # Specific to Rust
 if [ -n "${seed}" ]; then
 	# If set, then add to start parms
@@ -37,6 +34,8 @@ else
 	# Keep randomness of the number if not set
 	conditionalseed=""
 fi
+parms="-batchmode +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${servicename}\" ${conditionalseed} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile \"${gamelogdate}\""
+}
 
 #### LinuxGSM Settings ####
 

From 9f4f97d191dba7e3c02ef87df464adafd50cb989 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 19:04:57 +0000
Subject: [PATCH 19/56] added Just Cause 3

---
 lgsm/data/serverlist.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index a79a71552..a0ac22793 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -33,6 +33,7 @@ hldm,hldmserver,Half-Life: Deathmatch
 hw,hwserver,Hurtworld
 ins,insserver,Insurgency
 jc2,jc2server,Just Cause 2
+jc3,jc3server,Just Cause 3
 kf,kfserver,Killing Floor
 kf2,kf2server,Killing Floor 2
 l4d,l4dserver,Left 4 Dead

From 62c04ba201a2a97760bef8e8a536ec60f35da9cd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 19:09:21 +0000
Subject: [PATCH 20/56] Just Cause 3 config

---
 .../config-lgsm/jc3server/_default.cfg        | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 lgsm/config-default/config-lgsm/jc3server/_default.cfg

diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
new file mode 100644
index 000000000..3bfacac30
--- /dev/null
+++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
@@ -0,0 +1,115 @@
+##################################
+######## Default Settings ########
+##################################
+# DO NOT EDIT WILL BE OVERWRITTEN!
+# Copy settings from here and use them in either
+# common.cfg - applies settings to every instance
+# [instance].cfg - applies settings to a specific instance
+
+#### Server Settings ####
+
+## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
+fn_parms(){
+parms=""
+}
+
+#### LinuxGSM Settings ####
+
+## Notification Alerts
+# (on|off)
+
+# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info
+postalert="off"
+postdays="7"
+posttarget="https://hastebin.com"
+
+# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord
+discordalert="off"
+discordwebhook="webhook"
+
+# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT
+iftttalert="off"
+ifttttoken="accesstoken"
+iftttevent="linuxgsm_alert"
+
+# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun
+mailgunalert="off"
+mailguntoken="accesstoken"
+mailgundomain="example.com"
+mailgunemailfrom="alert@example.com"
+mailgunemail="email@myemail.com"
+
+# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover
+pushoveralert="off"
+pushovertoken="accesstoken"
+
+# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+
+## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update
+updateonstart="off"
+
+## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging
+consolelogging="on"
+logdays="7"
+
+#### LinuxGSM Advanced Settings ####
+
+## SteamCMD Settings
+# Server appid
+appid="619960"
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta latest_experimental"
+branch=""
+
+## LinuxGSM Server Details
+# Do not edit
+gamename="Just Cause 2"
+engine="avalanche"
+
+#### Directories ####
+# Edit with care
+
+## Server Specific Directories
+systemdir="${serverfiles}"
+executabledir="${serverfiles}"
+executable="./Jcmp-Server"
+servercfg="config.lua"
+servercfgdefault="config.lua"
+servercfgdir="${serverfiles}"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${rootdir}/backups"
+
+## Logging Directories
+logdir="${rootdir}/log"
+#gamelogdir="" # No server logs available
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+lgsmlog="${lgsmlogdir}/${servicename}-script.log"
+consolelog="${consolelogdir}/${servicename}-console.log"
+alertlog="${lgsmlogdir}/${servicename}-alert.log"
+postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
+
+## Logs Naming
+lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

From 0af0cbd74bf964fa7199c6d54d49210b34f3d854 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 19:16:23 +0000
Subject: [PATCH 21/56] updated gamename

---
 lgsm/config-default/config-lgsm/jc3server/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
index 3bfacac30..cdc984ae6 100644
--- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
@@ -82,7 +82,7 @@ branch=""
 
 ## LinuxGSM Server Details
 # Do not edit
-gamename="Just Cause 2"
+gamename="Just Cause 3"
 engine="avalanche"
 
 #### Directories ####

From 188d7799f288966bd6c1ec84662ae976f672a7e1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 19:28:30 +0000
Subject: [PATCH 22/56] Updated exec locations

---
 lgsm/config-default/config-lgsm/jc3server/_default.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
index cdc984ae6..59e008f24 100644
--- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
@@ -91,9 +91,9 @@ engine="avalanche"
 ## Server Specific Directories
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
-executable="./Jcmp-Server"
-servercfg="config.lua"
-servercfgdefault="config.lua"
+executable="./Server"
+servercfg="config.json"
+servercfgdefault="config.json"
 servercfgdir="${serverfiles}"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 

From d95a66ec51476e7160e9b01b17c5a06983c804e1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 21:19:28 +0000
Subject: [PATCH 23/56] Added Just Cause 3 config

---
 lgsm/functions/install_config.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 4def0ecf0..8fe08e095 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -336,6 +336,12 @@ elif [ "${gamename}" == "Just Cause 2" ]; then
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_set_config_vars
+elif [ "${gamename}" == "Just Cause 3" ]; then
+	gamedirname="JustCause3"
+	array_configs+=( config.json )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_set_config_vars
 elif [ "${gamename}" == "Killing Floor" ]; then
 	gamedirname="KillingFloor"
 	array_configs+=( Default.ini )

From 8dad7c5469d04eeb4b44585d7835b867c33c6cf2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 22:14:15 +0000
Subject: [PATCH 24/56] added details for JC3

---
 lgsm/functions/info_config.sh | 46 +++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 5127ffa4f..cb2c8ad1e 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -14,7 +14,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 # grep -v "foo" filter out lines that contain foo
 # cut -f1 -d "/" remove everything after /
 
-fn_info_config_avalanche(){
+fn_info_config_justcause2(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
 		serverpassword="${unavailable}"
@@ -38,6 +38,38 @@ fn_info_config_avalanche(){
 	fi
 }
 
+fn_info_config_justcause3(){
+	if [ ! -f "${servercfgfullpath}" ]; then
+		servername="${unavailable}"
+		serverpassword="${unavailable}"
+		maxplayers="${zero}"
+		port="${zero}"
+		queryPort="${zero}"
+		steamport="${zero}"
+		tickrate="${zero}"
+	else
+		serverpassword=$(grep "password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		maxplayers=$(grep "\"maxPlayers\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		port=$(grep "\"port\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		steamport=$(grep "\"queryPort\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		steamport=$(grep "\"steamPort\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		tickrate=$(grep "\"maxTickRate\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+
+		ip=$(grep "host" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/host//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		ipsetinconfig=1
+		ipinconfigvar="host"
+
+		# Not Set
+		servername=${servername:-"NOT SET"}
+		serverpassword=${serverpassword:-"NOT SET"}
+		maxplayers=${maxplayers=:-"0"}
+		port=${port=:-"0"}
+		queryport=${queryport=:-"0"}
+		steamport=${steamport=:-"0"}
+		tickrate=${tickrate=:-"0"}
+	fi
+}
+
 fn_info_config_ark(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
@@ -853,11 +885,9 @@ fn_info_config_squad(){
 	maxplayers=${maxplayers:-"0"}
 }
 
-# Just Cause 2
-if [ "${engine}" == "avalanche" ]; then
-	fn_info_config_avalanche
+
 # ARK: Survival Evolved
-elif [ "${gamename}" == "ARK: Survivial Evolved" ]; then
+if [ "${gamename}" == "ARK: Survivial Evolved" ]; then
 	fn_info_config_ark
 # Ballistic Overkill
 elif [ "${gamename}" == "Ballistic Overkill" ]; then
@@ -883,6 +913,12 @@ elif [ "${engine}" == "dontstarve" ]; then
 # Factorio
 elif [ "${gamename}" == "Factorio" ]; then
 	fn_info_config_factorio
+# Just Cause 2
+if [ "${gamename}" == "Just Cause 2" ]; then
+	fn_info_config_justcause2
+# Just Cause 3
+if [ "${gamename}" == "Just Cause 3" ]; then
+	fn_info_config_justcause3
 # Killing Floor 2
 elif [ "${shortname}" == "kf2" ]; then
 	fn_info_config_kf2

From d6617175e04f18b35c5f61c336f51be358431f92 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 22:14:43 +0000
Subject: [PATCH 25/56] corrected queryport

---
 lgsm/functions/info_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index cb2c8ad1e..0bb37947d 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -51,7 +51,7 @@ fn_info_config_justcause3(){
 		serverpassword=$(grep "password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
 		maxplayers=$(grep "\"maxPlayers\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
 		port=$(grep "\"port\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
-		steamport=$(grep "\"queryPort\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
+		queryport=$(grep "\"queryPort\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
 		steamport=$(grep "\"steamPort\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
 		tickrate=$(grep "\"maxTickRate\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
 

From ae15e4252261d27385c4d4626c2413b3bce59c96 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 22:25:00 +0000
Subject: [PATCH 26/56] fixed bugs

---
 lgsm/functions/info_config.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 0bb37947d..694a3407f 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -507,7 +507,7 @@ fn_info_config_starbound(){
 		# Not Set
 		servername=${servername:-"NOT SET"}
 		queryenabled=${queryenabled:-"NOT SET"}
-		rconenabled==${rconenabled:-"NOT SET"}
+		rconenabled=${rconenabled:-"NOT SET"}
 		rconpassword=${rconpassword:-"NOT SET"}
 		port=${port:-"21025"}
 		queryport=${queryport:-"21025"}
@@ -914,10 +914,10 @@ elif [ "${engine}" == "dontstarve" ]; then
 elif [ "${gamename}" == "Factorio" ]; then
 	fn_info_config_factorio
 # Just Cause 2
-if [ "${gamename}" == "Just Cause 2" ]; then
+elif [ "${gamename}" == "Just Cause 2" ]; then
 	fn_info_config_justcause2
 # Just Cause 3
-if [ "${gamename}" == "Just Cause 3" ]; then
+elif [ "${gamename}" == "Just Cause 3" ]; then
 	fn_info_config_justcause3
 # Killing Floor 2
 elif [ "${shortname}" == "kf2" ]; then

From 324846d8f4fef240394569cd71166ef6b8dfc106 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 22:28:48 +0000
Subject: [PATCH 27/56] update glibc for JC3

---
 lgsm/functions/info_glibc.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index a6f005c42..c0844beef 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -107,9 +107,12 @@ elif [ "${gamename}" == "TeamSpeak 3" ]; then
 elif [ "${gamename}" == "Teeworlds" ]; then
 	glibcrequired="2.14"
 	glibcfix="no"
-elif [ "${engine}" == "avalanche" ]; then
+elif [ "${gamename}" == "Just Cause 2" ]; then
 	glibcrequired="2.13"
 	glibcfix="yes"
+elif [ "${gamename}" == "Just Cause 3" ]; then
+	glibcrequired="2.17"
+	glibcfix="no"
 elif [ "${engine}" == "dontstarve" ]; then
 	glibcrequired="2.15"
 	glibcfix="no"

From f72e22a51d0ba6caed53001935630795c8b1ebdc Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 30 Nov 2017 22:34:49 +0000
Subject: [PATCH 28/56] updated for JC3

---
 lgsm/functions/info_messages.sh | 35 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 5cf46a89a..8f0729926 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -502,15 +502,6 @@ fn_info_message_ballisticoverkill(){
 	} | column -s $'\t' -t
 }
 
-fn_info_message_avalanche(){
-	echo -e "netstat -atunp | grep Jcmp-Server"
-	echo -e ""
-	{
-		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
-		echo -e "> Game\tINBOUND\t${port}\tudp"
-	} | column -s $'\t' -t
-}
-
 fn_info_message_cod(){
 	echo -e "netstat -atunp | grep cod_lnxded"
 	echo -e ""
@@ -597,6 +588,26 @@ fn_info_message_hurtworld(){
 	} | column -s $'\t' -t
 }
 
+fn_info_message_justcause2(){
+	echo -e "netstat -atunp | grep Jcmp-Server"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game\tINBOUND\t${port}\tudp"
+	} | column -s $'\t' -t
+}
+
+fn_info_message_justcause3(){
+	echo -e "netstat -atunp | grep Server"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game\tINBOUND\t${port}\tudp"
+		echo -e "> Query\tINBOUND\t${queryport}\tudp"
+		echo -e "> Steam\tINBOUND\t${steamport}\tudp"
+	} | column -s $'\t' -t
+}
+
 fn_info_message_minecraft(){
 	echo -e "netstat -atunp | grep java"
 	echo -e ""
@@ -985,6 +996,10 @@ fn_info_message_select_engine(){
 		fn_info_message_factorio
 	elif [ "${gamename}" == "Hurtworld" ]; then
 		fn_info_message_hurtworld
+	elif [ "${gamename}" == "Just Cause 2" ]; then
+		fn_info_message_justcause2
+	elif [ "${gamename}" == "Just Cause 3" ]; then
+		fn_info_message_justcause3
 	elif [ "${shortname}" == "kf2" ]; then
 		fn_info_message_kf2
 	elif [ "${gamename}" == "Project Cars" ]; then
@@ -1013,8 +1028,6 @@ fn_info_message_select_engine(){
 		fn_info_message_rust
 	elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
 		fn_info_message_wolfensteinenemyterritory
-	elif [ "${engine}" == "avalanche" ]; then
-		fn_info_message_avalanche
 	elif [ "${engine}" == "refractor" ]; then
 		fn_info_message_refractor
 	elif [ "${engine}" == "dontstarve" ]; then

From ba143835c65cc7ce70c23ebdf8fe04b4b5809b6b Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 20:51:30 +0000
Subject: [PATCH 29/56] Added JC3 servername and description

---
 lgsm/functions/info_config.sh   | 4 ++++
 lgsm/functions/info_messages.sh | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 694a3407f..ccf99dfe0 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -41,6 +41,7 @@ fn_info_config_justcause2(){
 fn_info_config_justcause3(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
+		serverdescription="${unavailable}"
 		serverpassword="${unavailable}"
 		maxplayers="${zero}"
 		port="${zero}"
@@ -48,6 +49,8 @@ fn_info_config_justcause3(){
 		steamport="${zero}"
 		tickrate="${zero}"
 	else
+		servername=$(grep "name" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/name//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		serverdescription=$(grep "description" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/description//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
 		serverpassword=$(grep "password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
 		maxplayers=$(grep "\"maxPlayers\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
 		port=$(grep "\"port\"" "${servercfgfullpath}" | tr -cd '[:digit:]')
@@ -61,6 +64,7 @@ fn_info_config_justcause3(){
 
 		# Not Set
 		servername=${servername:-"NOT SET"}
+		serverdescription=${servername:-"NOT SET"}
 		serverpassword=${serverpassword:-"NOT SET"}
 		maxplayers=${maxplayers=:-"0"}
 		port=${port=:-"0"}
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 8f0729926..b3ae5c9e3 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -126,6 +126,11 @@ fn_info_message_gameserver(){
 			echo -e "${blue}Server name:\t${default}${servername}"
 		fi
 
+		# Server description
+		if [ -n "${serverdescription}" ]; then
+			echo -e "${blue}Server name:\t${default}${serverdescription}"
+		fi
+
 		# Branch
 		if [ -n "${branch}" ]; then
 			echo -e "${blue}Branch:\t${default}${branch}"

From 2044fa2bb3d313981333cca54108944a1201bdfe Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:03:36 +0000
Subject: [PATCH 30/56] Corrected server desc

---
 lgsm/functions/info_messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index b3ae5c9e3..f6aa84b33 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -128,7 +128,7 @@ fn_info_message_gameserver(){
 
 		# Server description
 		if [ -n "${serverdescription}" ]; then
-			echo -e "${blue}Server name:\t${default}${serverdescription}"
+			echo -e "${blue}Server Description:\t${default}${serverdescription}"
 		fi
 
 		# Branch

From 0dd57c04857d8c73c48e2b7b947f54d509abf3f4 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:42:19 +0000
Subject: [PATCH 31/56] changed avalanche to avalanche2.0

Just Cause 3 has an unspecified version of the avalanche engine. Will assume its version 3.0
---
 lgsm/functions/command_details.sh     | 2 +-
 lgsm/functions/command_monitor.sh     | 2 +-
 lgsm/functions/command_postdetails.sh | 2 +-
 lgsm/functions/gsquery.py             | 4 ++--
 lgsm/functions/info_messages.sh       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index 8800949e5..f63e39189 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -23,7 +23,7 @@ fn_info_message_gameserver
 fn_info_message_script
 fn_info_message_backup
 # Some game servers do not have parms.
-if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
+if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
 	fn_parms
 	fn_info_message_commandlineparms
 fi
diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index ec94e0426..a6e1c713a 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -79,7 +79,7 @@ fn_monitor_tmux(){
 		fn_print_ok_eol_nl
 		fn_script_log_pass "Checking session: OK"
 		# runs gsquery check on game with specific engines.
-		local allowed_engines_array=( avalanche goldsource idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
+		local allowed_engines_array=( avalanche2.0 goldsource idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
 		for allowed_engine in "${allowed_engines_array[@]}"
 		do
 			if [ "${allowed_engine}" == "starbound" ]; then
diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index c8f9c06a5..5360e998c 100644
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -62,7 +62,7 @@ else
 		fn_info_message_script
 		fn_info_message_backup
 		# Some game servers do not have parms.
-		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
+		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
 			fn_parms
 			fn_info_message_commandlineparms
 		fi
diff --git a/lgsm/functions/gsquery.py b/lgsm/functions/gsquery.py
index c0192b6e1..a21b97f05 100644
--- a/lgsm/functions/gsquery.py
+++ b/lgsm/functions/gsquery.py
@@ -26,7 +26,7 @@ class PythonGSQ:
             self.query_prompt_string = b'\xff\xff\xff\xffstatus\x00'
         elif self.option.engine in idtech3query:
             self.query_prompt_string = b'\xff\xff\xff\xffgetstatus'
-        elif self.option.engine == 'avalanche':
+        elif self.option.engine == 'avalanche2.0':
             self.query_prompt_string = b'\xFE\xFD\x09\x10\x20\x30\x40'
         elif self.option.engine == 'unreal':
             self.query_prompt_string = b'\x5C\x69\x6E\x66\x6F\x5C'
@@ -100,7 +100,7 @@ if __name__ == '__main__':
         action='store',
         dest='engine',
         default=False,
-        help='Engine type: avalanche, goldsource, idtech2, idtech3, iw2.0, iw3.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.'
+        help='Engine type: avalanche2.0, goldsource, idtech2, idtech3, iw2.0, iw3.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.'
     )
     parser.add_option(
         '-v', '--verbose',
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index f6aa84b33..8a3cddb4e 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -402,7 +402,7 @@ fn_info_message_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines/games that require editing in the config file
-	local ports_edit_array=( "avalanche" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
+	local ports_edit_array=( "avalanche2.0" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${shortname}" == "ut3" ]; then

From 3aaa8050929fbdff5f582fed4c3425510f068574 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:43:00 +0000
Subject: [PATCH 32/56] changed engine to avalanche2.0

---
 lgsm/config-default/config-lgsm/jc2server/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/jc2server/_default.cfg b/lgsm/config-default/config-lgsm/jc2server/_default.cfg
index 1cfce558f..6dafd3d93 100644
--- a/lgsm/config-default/config-lgsm/jc2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/jc2server/_default.cfg
@@ -83,7 +83,7 @@ branch=""
 ## LinuxGSM Server Details
 # Do not edit
 gamename="Just Cause 2"
-engine="avalanche"
+engine="avalanche2.0"
 
 #### Directories ####
 # Edit with care

From 653c406b65bc15789746730bba6cefb36ba0d309 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:43:07 +0000
Subject: [PATCH 33/56] changed engine to avalanche3.0

---
 lgsm/config-default/config-lgsm/jc3server/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/jc3server/_default.cfg b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
index 59e008f24..84d0f0b22 100644
--- a/lgsm/config-default/config-lgsm/jc3server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/jc3server/_default.cfg
@@ -83,7 +83,7 @@ branch=""
 ## LinuxGSM Server Details
 # Do not edit
 gamename="Just Cause 3"
-engine="avalanche"
+engine="avalanche3.0"
 
 #### Directories ####
 # Edit with care

From bfd0493cf2cf2be2816abe13ec592c350a6206bd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:45:47 +0000
Subject: [PATCH 34/56] added avalanche3.0 engine

---
 lgsm/functions/gsquery.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/gsquery.py b/lgsm/functions/gsquery.py
index a21b97f05..bd1a2b953 100644
--- a/lgsm/functions/gsquery.py
+++ b/lgsm/functions/gsquery.py
@@ -17,7 +17,7 @@ class PythonGSQ:
         self.server_response_timeout = 5
         self.default_buffer_length = 1024
         #
-        sourcequery=['madness','quakelive','realvirtuality','refractor','source','goldsource','spark','starbound','unity3d']
+        sourcequery=[ 'avalanche3.0','madness','quakelive','realvirtuality','refractor','source','goldsource','spark','starbound','unity3d']
         idtech2query=['idtech3','quake','iw3.0']
         idtech3query=['idtech2','iw2.0']
         if self.option.engine in sourcequery:

From 7f2f6a6685634a44b5d060e9bd23d02931587bc8 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:46:17 +0000
Subject: [PATCH 35/56] avalanche3.0

---
 lgsm/functions/gsquery.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/gsquery.py b/lgsm/functions/gsquery.py
index bd1a2b953..bba0b97fd 100644
--- a/lgsm/functions/gsquery.py
+++ b/lgsm/functions/gsquery.py
@@ -100,7 +100,7 @@ if __name__ == '__main__':
         action='store',
         dest='engine',
         default=False,
-        help='Engine type: avalanche2.0, goldsource, idtech2, idtech3, iw2.0, iw3.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.'
+        help='Engine type: avalanche2.0, avalanche3.0, goldsource, idtech2, idtech3, iw2.0, iw3.0, realvirtuality, quake, quakelive, refractor, spark, source, unity3d, unreal, unreal2.'
     )
     parser.add_option(
         '-v', '--verbose',

From 1bc944482fce38786de8670fdeb72e19e8fb8d8c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:49:29 +0000
Subject: [PATCH 36/56] avalanche3.0

---
 lgsm/functions/command_monitor.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index a6e1c713a..dd8e41676 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -79,7 +79,7 @@ fn_monitor_tmux(){
 		fn_print_ok_eol_nl
 		fn_script_log_pass "Checking session: OK"
 		# runs gsquery check on game with specific engines.
-		local allowed_engines_array=( avalanche2.0 goldsource idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
+		local allowed_engines_array=( avalanche2.0 avalanche3.0 goldsource idtech3 idtech3_ql iw2.0 iw3.0 madness quake refractor realvirtuality source spark starbound unity3d unreal unreal2 )
 		for allowed_engine in "${allowed_engines_array[@]}"
 		do
 			if [ "${allowed_engine}" == "starbound" ]; then

From e261e241db538fb64fda39fe53ab79e8cdcadb20 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 21:54:29 +0000
Subject: [PATCH 37/56] avalanche3.0

---
 lgsm/functions/info_messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 8a3cddb4e..d765216b0 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -402,7 +402,7 @@ fn_info_message_ports(){
 
 	parmslocation="${red}UNKNOWN${default}"
 	# engines/games that require editing in the config file
-	local ports_edit_array=( "avalanche2.0" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
+	local ports_edit_array=( "avalanche2.0" "avalanche3.0" "Ballistic Overkill" "dontstarve" "idtech2" "idtech3" "idtech3_ql" "lwjgl2" "Project Cars" "projectzomboid" "quake" "refractor" "realvirtuality" "renderware" "seriousengine35" "teeworlds" "terraria" "unreal" "unreal2" "unreal3" "TeamSpeak 3" "Mumble" "7 Days To Die" )
 	for port_edit in "${ports_edit_array[@]}"
 	do
 		if [ "${shortname}" == "ut3" ]; then

From 34595af785322bf58edfe2815310fb6927c886fa Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 22:02:50 +0000
Subject: [PATCH 38/56] fixed serverdescription error

---
 lgsm/functions/info_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index ccf99dfe0..898191d34 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -64,7 +64,7 @@ fn_info_config_justcause3(){
 
 		# Not Set
 		servername=${servername:-"NOT SET"}
-		serverdescription=${servername:-"NOT SET"}
+		serverdescription=${serverdescription:-"NOT SET"}
 		serverpassword=${serverpassword:-"NOT SET"}
 		maxplayers=${maxplayers=:-"0"}
 		port=${port=:-"0"}

From 817b15a02f3abe2ebbd056b42f80f5415468b500 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 22:14:59 +0000
Subject: [PATCH 39/56] added avalanche engines to CTRL+c exit

---
 lgsm/functions/command_stop.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index 9b76089af..1d5f37473 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -189,7 +189,7 @@ fn_stop_graceful_select(){
 		fn_stop_graceful_cmd "quit" 120
 	elif [ "${engine}" == "goldsource" ]; then
 		fn_stop_graceful_goldsource
-	elif [ "${gamename}" == "Factorio" ]||[ "${engine}" == "unity3d" ]||[ "${engine}" == "unreal4" ]||[ "${engine}" == "unreal3" ]||[ "${engine}" == "unreal2" ]||[ "${engine}" == "unreal" ]||[ "${gamename}" == "Mumble" ]; then
+	elif [ "${engine}" == "avalanche2.0" ]||[ "${engine}" == "avalanche3.0" ]||[ "${gamename}" == "Factorio" ]||[ "${engine}" == "unity3d" ]||[ "${engine}" == "unreal4" ]||[ "${engine}" == "unreal3" ]||[ "${engine}" == "unreal2" ]||[ "${engine}" == "unreal" ]||[ "${gamename}" == "Mumble" ]; then
 		fn_stop_graceful_ctrlc
 	elif  [ "${engine}" == "source" ]||[ "${engine}" == "quake" ]||[ "${engine}" == "idtech2" ]||[ "${engine}" == "idtech3" ]||[ "${engine}" == "idtech3_ql" ]||[ "${engine}" == "Just Cause 2" ]||[ "${engine}" == "projectzomboid" ]; then
 		fn_stop_graceful_cmd "quit" 30

From 9a98deb6fa722961c48e438c1aa7125de8befb29 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 22:18:21 +0000
Subject: [PATCH 40/56] Added description to Just Cause 2

---
 lgsm/functions/info_config.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 898191d34..1f01db5e3 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -22,6 +22,7 @@ fn_info_config_justcause2(){
 		port="${zero}"
 	else
 		servername=$(grep "Name" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^--/d' -e 's/Name//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		serverdescription=$(grep "Description" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^--/d' -e 's/Description//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
 		serverpassword=$(grep "Password" "${servercfgfullpath}" | sed -e 's/^ *//g' -e '/^--/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
 		maxplayers=$(grep "MaxPlayers" "${servercfgfullpath}" | grep -v "\--" | tr -cd '[:digit:]')
 		port=$(grep "BindPort" "${servercfgfullpath}" | grep -v "\--" | tr -cd '[:digit:]')

From efbbe4186583c3e2d7d03657a314cff0d8c42467 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 5 Dec 2017 23:25:03 +0000
Subject: [PATCH 41/56] Fixed issue identifying ip not being set in game config
 if 1 IP

if server has single IP and required IP to be specified in game config check_ip was not detecting the issue
---
 lgsm/functions/check_ip.sh | 55 +++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh
index c0985f850..7b8d9f3eb 100644
--- a/lgsm/functions/check_ip.sh
+++ b/lgsm/functions/check_ip.sh
@@ -17,37 +17,62 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi
 	getip=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -v 127.0.0)
 	getipwc=$(${ipcommand} -o -4 addr|awk '{print $4}'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -vc 127.0.0)
 	info_config.sh
+
+	# IP is not set to specific IP
 	if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
+		fn_print_dots "Check IP"
+		sleep 1
+		# Multiple interfaces
 		if [ "${getipwc}" -ge "2" ]; then
-			fn_print_dots "Check IP"
-			sleep 1
-			fn_print_fail "Check IP: Multiple active network interfaces found."
+			fn_print_fail "Check IP: Multiple IP addresses found."
 			sleep 1
 			echo -en "\n"
+			# IP is set within game config
 			if [ "${ipsetinconfig}" == "1" ]; then
-				fn_print_information "Specify the IP you want to use within the game server config file ${servercfg}.\n"
-				echo -en "${servercfgfullpath}\n"
+				fn_print_information "Specify the IP you want to bind within ${servercfg}.\n"
+				echo -en "	* location: ${servercfgfullpath}\n"
+				echo -en "\n"
 				echo -en "Set ${ipinconfigvar} to one of the following:\n"
+				fn_script_log_fatal "Multiple IP addresses found."
+				fn_script_log_fatal "Specify the IP you want to bind within: ${servercfgfullpath}."
+			# IP is set within LinuxGSM config
 			else
-				fn_print_information_nl "Specify the IP you want to use within a LinuxGSM config file."
-				echo -en "location: ${configdirserver}\n"
-				echo ""
+				fn_print_information_nl "Specify the IP you want to bind within a LinuxGSM config file.\n"
+				echo -en "	* location: ${configdirserver}\n"
+				echo -en "\n"
 				echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
+				fn_script_log_fatal "Multiple IP addresses found."
+				if [ "${legacymode}" == "1" ]; then
+					fn_script_log_fatal "Specify the IP you want to bind within the ${selfname} script."
+				else
+					fn_script_log_fatal "Specify the IP you want to bind within: ${configdirserver}."
+				fi
 			fi
 			echo -en "${getip}\n"
+			echo -en "\n"
+			echo -en "https://gameservermanagers.com/network-interfaces\n"
 			echo -en ""
+			fn_script_log_fatal "https://gameservermanagers.com/network-interfaces\n"
+			core_exit.sh
+		# Single interface
+		elif [ "${ipsetinconfig}" == "1" ]; then
+			fn_print_fail "Check IP: IP address not set in game config."
+			sleep 1
+			echo -en "\n"
+			fn_print_information "Specify the IP you want to bind within ${servercfg}.\n"
+			echo -en "	* location: ${servercfgfullpath}\n"
+			echo -en "\n"
+			echo -en "Set ${ipinconfigvar} to the following:\n"
+			echo -en "${getip}\n"
+			echo -en "\n"
 			echo -en "https://gameservermanagers.com/network-interfaces\n"
 			echo -en ""
-			fn_script_log_fatal "Multiple active network interfaces found."
-			if [ "${legacymode}" == "1" ]; then
-				fn_script_log_fatal "Manually specify the IP you want to use within the ${selfname} script."
-			else
-				fn_script_log_fatal "Manually specify the IP you want to use within: ${configdirserver}."
-			fi
+			fn_script_log_fatal "IP address not set in game config."
+			fn_script_log_fatal "Specify the IP you want to bind within: ${servercfgfullpath}."
 			fn_script_log_fatal "https://gameservermanagers.com/network-interfaces\n"
 			core_exit.sh
 		else
-			ip=${getip}
+			ip="${getip}"
 		fi
 	fi
 fi

From 9d7d801bfd431dc6ebc45ac22313c75bce302412 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 11:03:37 +0000
Subject: [PATCH 42/56] increased NS2 glibc requirements to 2.17

---
 lgsm/functions/info_glibc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index c0844beef..ad7c367e9 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -135,7 +135,7 @@ elif [ "${engine}" == "goldsource" ]; then
 	glibcrequired="2.3.4"
 	glibcfix="no"
 elif [ "${engine}" == "spark" ]; then
-	glibcrequired="2.15"
+	glibcrequired="2.17"
 	glibcfix="yes"
 elif [ "${engine}" == "starbound" ]; then
 	glibcrequired="2.17"

From 3abb4d45491b654a2d6a47511a6e2e4c68397de5 Mon Sep 17 00:00:00 2001
From: Sebastian Schuck <sebastian@naturalselection2.com>
Date: Sat, 16 Dec 2017 15:27:58 +0100
Subject: [PATCH 43/56] Updated the Natural Selection 2 default config to
 support the new 64bit server binaries. 32bit support has been dropped. Also
 updated the dependency and glibc checks to support the 64bit version of spark
 properly. Note that ns2:combat continues to use a old 32bit fork of spark.

---
 .../config-lgsm/ns2server/_default.cfg         |  4 ++--
 lgsm/functions/check_deps.sh                   | 18 ++++++++++++------
 lgsm/functions/info_glibc.sh                   |  5 ++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
index b0def88d5..ab235c78b 100644
--- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
@@ -109,8 +109,8 @@ engine="spark"
 
 ## Server Specific Directories
 systemdir="${serverfiles}"
-executabledir="${serverfiles}"
-executable="./server_linux32"
+executabledir="${serverfiles}/x64"
+executable="./server_linux"
 servercfgdir="${rootdir}/server1"
 servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 4ea2295bc..80720c5fc 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -167,11 +167,14 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then
 
 	# Game Specific requirements
 
-	# Spark
-	if [ "${engine}" ==  "spark" ]; then
+	# Natural Selection 2
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex libtbb2 )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex:i386 libtbb2 )
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
@@ -255,11 +258,14 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# Game Specific requirements
 
-	# Spark
-	if [ "${engine}" ==  "spark" ]; then
+	# Natural Selection 2
+	if [ "${gamename}" == "Natural Selection 2" ]; then
+		array_deps_required+=( speex libtbb2 )
+	# NS2: Combat
+	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex.i686 tbb.i686 )
 	# 7 Days to Die
-	elif [ "${gamename}" ==  "7 Days To Die" ]; then
+	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
 	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index a6f005c42..d043088be 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -131,7 +131,10 @@ elif [ "${engine}" == "source" ]; then
 elif [ "${engine}" == "goldsource" ]; then
 	glibcrequired="2.3.4"
 	glibcfix="no"
-elif [ "${engine}" == "spark" ]; then
+elif [ "${gamename}" == "Natural Selection 2" ]; then
+	glibcrequired="2.17"
+	glibcfix="yes"
+elif [ "${gamename}" == "NS2: Combat" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
 elif [ "${engine}" == "starbound" ]; then

From 2c84d5766cde024162418048dca8149bee8b1572 Mon Sep 17 00:00:00 2001
From: Sebastian Schuck <sebastian@naturalselection2.com>
Date: Sat, 16 Dec 2017 16:03:39 +0100
Subject: [PATCH 44/56] Fixed that tbb lib name was wrong for centOS.

---
 lgsm/functions/check_deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 80720c5fc..3281eaab9 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -260,7 +260,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# Natural Selection 2
 	if [ "${gamename}" == "Natural Selection 2" ]; then
-		array_deps_required+=( speex libtbb2 )
+		array_deps_required+=( speex tbb )
 	# NS2: Combat
 	elif [ "${gamename}" == "NS2: Combat" ]; then
 		array_deps_required+=( speex.i686 tbb.i686 )

From 41ce6303b2039cccb92832816d6c0a214b00921a Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 19:00:01 +0000
Subject: [PATCH 45/56] NS2C is now anonymous

---
 lgsm/config-default/config-lgsm/ns2cserver/_default.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
index 5f5d02288..32e177aa8 100644
--- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
@@ -8,10 +8,6 @@
 
 #### Server Settings ####
 
-## SteamCMD Login | https://github.com/GameServerManagers/LinuxGSM/wiki/SteamCMD#steamcmd-login
-steamuser="username"
-steampass='password'
-
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 ip="0.0.0.0"
 port="27015"

From f3de875324a125ba244876f1ce7e6a66c0cb758f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 19:45:26 +0000
Subject: [PATCH 46/56] added graceful shutdown for NS2 and NS2C

---
 lgsm/functions/command_stop.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh
index 1d5f37473..4b117752e 100644
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@@ -180,6 +180,8 @@ fn_stop_graceful_sdtd(){
 fn_stop_graceful_select(){
 	if [ "${gamename}" == "7 Days To Die" ]; then
 		fn_stop_graceful_sdtd
+	elif [ "${engine}" == "Spark" ]; then
+		fn_stop_graceful_cmd "q" 30
 	elif [ "${gamename}" == "Terraria" ]; then
 		fn_stop_graceful_cmd "exit" 30
 	elif [ "${gamename}" == "Minecraft" ]; then

From 11dc6e48cdb4b7aa91fa12c330359058021eeb39 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:01:32 +0000
Subject: [PATCH 47/56] updated netstat for ns2

---
 lgsm/functions/info_messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index d765216b0..cca42c6d3 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -795,7 +795,7 @@ fn_info_message_source(){
 
 fn_info_message_spark(){
 	fn_info_message_password_strip
-	echo -e "netstat -atunp | grep server_linux3"
+	echo -e "netstat -atunp | grep server_linux"
 	echo -e ""
 	{
 		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"

From 26a1f4992f88771a521e101576a06fccca67fded Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:08:09 +0000
Subject: [PATCH 48/56] Will send alert if _default.cfg has changed

---
 lgsm/functions/alert.sh                   | 11 +++++++++++
 lgsm/functions/command_update_linuxgsm.sh |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index 60baa1ed6..5faa6e2bd 100644
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -71,6 +71,15 @@ fn_alert_permissions(){
 	alertbody="${servicename} has permissions issues"
 }
 
+fn_alert_config(){
+	fn_script_log_info "Sending alert: New _default.cfg"
+	alertsubject="Alert - ${servicename} - New _default.cfg"
+	alertemoji="🎮"
+	alertsound="1"
+	alerturl="not enabled"
+	alertbody="${servicename} has recieved a new _default.cfg. Check file for changes."
+}
+
 if [ "${alert}" == "permissions" ]; then
 	fn_alert_permissions
 elif [ "${alert}" == "restart" ]; then
@@ -81,6 +90,8 @@ elif [ "${alert}" == "test" ]; then
 	fn_alert_test
 elif [ "${alert}" == "update" ]; then
 	fn_alert_update
+elif [ "${alert}" == "config" ]; then
+	fn_alert_config
 fi
 
 # Generate alert log
diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh
index d1cdb8c52..fdd42e361 100644
--- a/lgsm/functions/command_update_linuxgsm.sh
+++ b/lgsm/functions/command_update_linuxgsm.sh
@@ -23,6 +23,8 @@ if [ -z "${legacymode}" ];then
 		fn_script_log_info "checking config _default.cfg: UPDATE"
 		rm -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg"
 		fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforce" "nomd5"
+		alert="config"
+		alert.sh
 	else
 		fn_print_ok_eol_nl
 		fn_script_log_info "checking config _default.cfg: OK"

From db771a8f4387c829356d212e7562c3781bd9d37d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:11:56 +0000
Subject: [PATCH 49/56] Updated servercfgdir from server1 to servicename

---
 lgsm/config-default/config-lgsm/ns2cserver/_default.cfg | 2 +-
 lgsm/config-default/config-lgsm/ns2server/_default.cfg  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
index 32e177aa8..956366c80 100644
--- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
@@ -107,7 +107,7 @@ engine="spark"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/ia32"
 executable="./ns2combatserver_linux32"
-servercfgdir="${rootdir}/server1"
+servercfgdir="${serverfiles}/${servicename}"
 servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
 
diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
index ab235c78b..902c0d33d 100644
--- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
@@ -111,7 +111,7 @@ engine="spark"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/x64"
 executable="./server_linux"
-servercfgdir="${rootdir}/server1"
+servercfgdir="${serverfiles}/${servicename}"
 servercfgfullpath="${servercfgdir}"
 modstoragedir="${servercfgdir}/Workshop"
 

From be923393cd742457fb78b14ea1f1802c6020a3af Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:21:03 +0000
Subject: [PATCH 50/56] updated version

---
 linuxgsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index 54439f1a6..3c4ec12cb 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="171014"
+version="171216"
 shortname="core"
 gameservername="core"
 rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"

From 9edeb548e94d7df7bdd5a48286d5096d6b6b0e77 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:25:12 +0000
Subject: [PATCH 51/56] Made game modes Alphabetical

---
 lgsm/config-default/config-lgsm/csgoserver/_default.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index ee006ea9c..984c925fb 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -11,12 +11,12 @@
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
 # [Game Modes]			gametype	gamemode
+# Arms Race				1			0
 # Classic Casual		0			0
 # Classic Competitive	0			1
-# Arms Race				1			0
-# Demolition			1			1
-# Deathmatch			1			2
 # Custom				3			0
+# Deathmatch			1			2
+# Demolition			1			1
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From 67f92c2ed57c62da96e02be39e37da20a43a1f24 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:35:15 +0000
Subject: [PATCH 52/56] re worded comment about -disableluarefresh

---
 lgsm/config-default/config-lgsm/gmodserver/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
index e35984540..a0d7c716f 100644
--- a/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/gmodserver/_default.cfg
@@ -24,7 +24,7 @@ workshopcollectionid=""
 
 ## Custom Start Parameters
 # Default +r_hunkalloclightmaps 0, fixes a start issue on maps with many lights
-# Default -disableluarefresh, disables autorefresh which should only be used when developing to avoid unwanted behavior
+# Default -disableluarefresh, disables lua autorefresh reducing server lag. Auto refresh only useful for developers.
 customparms="+r_hunkalloclightmaps 0 -disableluarefresh"
 
 ## Optional: Game Server Login Token

From 5b9cec54287f4baa430521523321c11f56490e5d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:54:37 +0000
Subject: [PATCH 53/56] Capital

---
 lgsm/functions/core_dl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index 2adb4bf08..a5361a9b7 100644
--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@@ -105,7 +105,7 @@ fn_fetch_file(){
 	forcedl="${6:-0}"
 	md5="${7:-0}"
 
-	# download file if missing or download forced
+	# Download file if missing or download forced
 	if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then
 		if [ ! -d "${local_filedir}" ]; then
 			mkdir -p "${local_filedir}"

From df0e29fbe23b3ef73cdfd3bb5748f6b1c03bd82c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:55:30 +0000
Subject: [PATCH 54/56] added avalanche3.0  to avoid posting parms

---
 lgsm/functions/command_postdetails.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index 5360e998c..15f4feb5e 100644
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -62,7 +62,7 @@ else
 		fn_info_message_script
 		fn_info_message_backup
 		# Some game servers do not have parms.
-		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
+		if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche2.0" ]&&[ "${engine}" != "avalanche3.0" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
 			fn_parms
 			fn_info_message_commandlineparms
 		fi

From 81d89ccac0076bf3a1e357d0f646fdcfff22e7b5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:55:56 +0000
Subject: [PATCH 55/56] Added Zombie! Panic Source to lib32tinfo5

---
 lgsm/functions/check_deps.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
index 7f6764f4d..31a2fb077 100644
--- a/lgsm/functions/check_deps.sh
+++ b/lgsm/functions/check_deps.sh
@@ -177,7 +177,7 @@ if [ -n "$(command -v dpkg-query 2>/dev/null)" ]; then
 	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 			array_deps_required+=( lib32tinfo5 )
 		else
@@ -255,7 +255,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 
 	# All servers except ts3,mumble,multitheftauto and minecraft servers require glibc.i686 and libstdc++.i686
 	if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${engine}" != "lwjgl2" ]&&[ "${engine}" != "renderware" ]; then
-		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then		
+		if [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then
             		array_deps_required+=( glibc.i686 libstdc++64.i686 )
         	else
 			array_deps_required+=( glibc.i686 libstdc++.i686 )
@@ -274,7 +274,7 @@ elif [ -n "$(command -v yum 2>/dev/null)" ]; then
 	elif [ "${gamename}" == "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
 	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]||[ "${gamename}" == "Zombie Panic! Source" ]; then
 		array_deps_required+=( ncurses-libs.i686 )
 	# Brainbread 2, Don't Starve Together & Team Fortress 2
 	elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]||[ "${gamename}" == "Team Fortress 2" ]; then

From 4177293ce7b076ca9f5bc7ce8b91b132f7eed1da Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 16 Dec 2017 20:58:34 +0000
Subject: [PATCH 56/56] Corrected glibc requirements for ZPS

---
 lgsm/functions/info_glibc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index ea65ecf0e..b04f79644 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -179,6 +179,9 @@ elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
 elif [ "${gamename}" == "Multi Theft Auto" ]; then
 	glibcrequired="2.7"
 	glibcfix="no"
+elif [ "${gamename}" == "Zombie Panic! Source" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 else
 	glibcrequired="UNKNOWN"
 	glibcfix="no"