From 47a02e87d64d5be2de4463df6c359cc1f5b6a69f Mon Sep 17 00:00:00 2001
From: Christian <h3o66@users.noreply.github.com>
Date: Sun, 20 Sep 2020 22:01:19 +0200
Subject: [PATCH 1/3] fix(mod): csgo pug fix var not set (#3053)

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

diff --git a/lgsm/functions/mods_list.sh b/lgsm/functions/mods_list.sh
index aa0ee7614..13ae3e268 100755
--- a/lgsm/functions/mods_list.sh
+++ b/lgsm/functions/mods_list.sh
@@ -35,8 +35,8 @@ get5latestfile=$(echo -e "${get5lastbuild}" | jq -r '.fileName')
 get5latestfilepath=$(echo -e "${get5lastbuild}" | jq -r '.relativePath')
 get5url="https://ci.splewis.net/job/get5/lastSuccessfulBuild/artifact/${get5latestfilepath}"
 csgopuglatest=$(curl -sL https://api.github.com/repos/splewis/csgo-pug-setup/releases/latest | jq '.assets[]')
-csgopuglatestfile=$(echo -e "${}" | jq -r '.name')
-csgopuglatestlink=$(echo -e "${}" | jq -r '.browser_download_url')
+csgopuglatestfile=$(echo -e "${csgopuglatest}" | jq -r '.name')
+csgopuglatestlink=$(echo -e "${csgopuglatest}" | jq -r '.browser_download_url')
 # Oxide
 oxiderustlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | jq -r '.assets[]|select(.browser_download_url | contains("linux")) | .browser_download_url')
 oxidehurtworldlatestlink=$(curl -sL https://api.github.com/repos/OxideMod/Oxide.Hurtworld/releases/latest | jq -r '.assets[].browser_download_url')

From 5b84fb5bf4bbeb26155ef62e68c49aa56c778b66 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Sep 2020 21:32:35 +0100
Subject: [PATCH 2/3] Release 20.5.0

---
 lgsm/functions/alert_discord.sh            |   3 +-
 lgsm/functions/alert_rocketchat.sh         |   2 +-
 lgsm/functions/alert_slack.sh              | 103 ++++++++++-----------
 lgsm/functions/check_ip.sh                 |   8 +-
 lgsm/functions/command_postdetails.sh      |   2 +-
 lgsm/functions/command_update.sh           |   2 +-
 lgsm/functions/command_update_functions.sh |   0
 lgsm/functions/core_functions.sh           |   2 +-
 lgsm/functions/fix_squad.sh                |   2 +-
 linuxgsm.sh                                |   2 +-
 tests/tests_defaultcfg/defaultcfg_0.txt    |  11 ++-
 tests/tests_fctrserver.sh                  |   2 +-
 tests/tests_jc2server.sh                   |   2 +-
 tests/tests_mcserver.sh                    |   2 +-
 tests/tests_ts3server.sh                   |   2 +-
 15 files changed, 72 insertions(+), 73 deletions(-)
 delete mode 100755 lgsm/functions/command_update_functions.sh

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index c19e66506..b9512bbe7 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -21,7 +21,8 @@ json=$(cat <<EOF
 		"color": "2067276",
 		"author": {
 			"name": "${alertemoji} ${alertsubject} ${alertemoji}",
-			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
+			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"
+		},
 		"title": "${servername}",
 		"description": "${alertbody} \n More info: ${alerturl}",
 		"url": "",
diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
index c7c26aeb3..505113918 100755
--- a/lgsm/functions/alert_rocketchat.sh
+++ b/lgsm/functions/alert_rocketchat.sh
@@ -48,6 +48,6 @@ if [ -n "${rocketchatsend}" ]; then
 	fn_print_ok_nl "Sending Rocketchat alert"
 	fn_script_log_pass "Sending Rocketchat alert"
 else
-		fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}"
+	fn_print_fail_nl "Sending Rocketchat alert: ${rocketchatsend}"
 	fn_script_log_fatal "Sending Rocketchat alert: ${rocketchatsend}"
 fi
diff --git a/lgsm/functions/alert_slack.sh b/lgsm/functions/alert_slack.sh
index a55dbe97b..0ea5a41f8 100755
--- a/lgsm/functions/alert_slack.sh
+++ b/lgsm/functions/alert_slack.sh
@@ -13,59 +13,54 @@ fi
 
 json=$(cat <<EOF
 {
-	"attachments": [
-		{
-			"blocks": [
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": "*${alertemoji} ${alertsubject} ${alertemoji}*"
-					}
-				},
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": "*${servername}*"
-					}
-				},
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": "${alertbody} \n More info: ${alerturl}"
-					}
-				},
-				{
-					"type": "divider"
-				},
-				{
-					"type": "section",
-					"fields": [
-						{
-							"type": "mrkdwn",
-							"text": "*Game:* \n ${gamename}"
-						},
-						{
-							"type": "mrkdwn",
-							"text": "*Server IP:* \n ${alertip}:${port}"
-						}
-					]
-				},
-				{
-					"type": "divider"
-				},
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": "*Hostname:* ${HOSTNAME}"
-					}
-				}
-			]
-		}
-	]
+		"attachments": [
+			{
+				"color": "#36a64f",
+				"blocks": [
+					{
+										"type": "section",
+										"text": {
+												"type": "mrkdwn",
+												"text": "*LinuxGSM Alert*"
+										}
+								},
+								{
+										"type": "section",
+										"text": {
+												"type": "mrkdwn",
+												"text": "*${alertemoji} ${alertsubject}* \n ${alertbody}"
+										}
+								},
+								{
+										"type": "divider"
+								},
+								{
+										"type": "section",
+										"fields": [
+												{
+														"type": "mrkdwn",
+														"text": "*Game:* \n ${gamename}"
+												},
+												{
+														"type": "mrkdwn",
+														"text": "*Server IP:* \n ${alertip}:${port}"
+												},
+												{
+														"type": "mrkdwn",
+														"text": "*Server Name:* \n ${servername}"
+												}
+										]
+								},
+					 {
+										"type": "section",
+										"text": {
+														"type": "mrkdwn",
+														"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}"
+										}
+								}
+						]
+			}
+		]
 }
 EOF
 )
@@ -78,6 +73,6 @@ if [ "${slacksend}" == "ok" ]; then
 	fn_print_ok_nl "Sending Slack alert"
 	fn_script_log_pass "Sending Slack alert"
 else
-		fn_print_fail_nl "Sending Slack alert: ${slacksend}"
+	fn_print_fail_nl "Sending Slack alert: ${slacksend}"
 	fn_script_log_fatal "Sending Slack alert: ${slacksend}"
 fi
diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh
index bf7ea226c..a4ddf7ae0 100755
--- a/lgsm/functions/check_ip.sh
+++ b/lgsm/functions/check_ip.sh
@@ -27,10 +27,10 @@ if [ -n "${ip}" ]&&[ "${ip}" != "0.0.0.0" ]; then
 	telnetip=( "${ip}" )
 # If game config does have an IP set.
 elif [ -n "${configip}" ]&&[ "${configip}" != "0.0.0.0" ];then
-		queryips=( "${configip}" )
-		ip="${configip}"
-		webadminip=( "${configip}" )
-		telnetip=( "${configip}" )
+	queryips=( "${configip}" )
+	ip="${configip}"
+	webadminip=( "${configip}" )
+	telnetip=( "${configip}" )
 # If there is only 1 server IP address.
 # Some IP details can automaticly use the one IP
 elif [ "${getipwc}" == "1" ]; then
diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index b6fbb4495..c819568f8 100755
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -73,8 +73,8 @@ if [ ${firstcommandname} == "POST-DETAILS" ]; then
 	echo -e "${pdurl}"
 fi
 fn_script_log_info "${pdurl}"
+alerturl="${pdurl}"
 
 if [ -z "${exitbypass}" ]; then
 	core_exit.sh
 fi
-alerturl="${pdurl}"
diff --git a/lgsm/functions/command_update.sh b/lgsm/functions/command_update.sh
index d4804edef..b117cbec5 100755
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@@ -27,7 +27,7 @@ elif [ "${shortname}" == "fctr" ]; then
 elif [ "${shortname}" == "mta" ]; then
 	update_mta.sh
 elif [ "${shortname}" == "jk2" ]; then
-	update_jediknight2.sh	
+	update_jediknight2.sh
 else
 	update_steamcmd.sh
 fi
diff --git a/lgsm/functions/command_update_functions.sh b/lgsm/functions/command_update_functions.sh
deleted file mode 100755
index e69de29bb..000000000
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index c869d4a41..ea11f7e70 100755
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -7,7 +7,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v20.4.1"
+modulesversion="v20.5.0"
 
 # Core
 
diff --git a/lgsm/functions/fix_squad.sh b/lgsm/functions/fix_squad.sh
index 199070af0..28d0e30f0 100644
--- a/lgsm/functions/fix_squad.sh
+++ b/lgsm/functions/fix_squad.sh
@@ -8,7 +8,7 @@
 oldservercfg="${serverfiles}/Squad/ServerConfig/${servercfg}"
 if [ -f "${oldservercfg}" ] && [ -f "${servercfgfullpath}" ]; then
 	# diff old and new config - if it is different move the old config over the new one
-	if [ $(diff -c "${oldservercfg}" "${servercfgfullpath}" | wc -l) -gt 0 ]; then
+	if [ "$(diff -c "${oldservercfg}" "${servercfgfullpath}" | wc -l)" -gt 0 ]; then
 		fixname="Migrate server config to new Game folder"
 		fn_fix_msg_start
 		mv -v "${oldservercfg}" "${servercfgfullpath}"
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 8e8c14dcc..712f2eccf 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.4.1"
+version="v20.5.0"
 shortname="core"
 gameservername="core"
 commandname="CORE"
diff --git a/tests/tests_defaultcfg/defaultcfg_0.txt b/tests/tests_defaultcfg/defaultcfg_0.txt
index 50c1d0ee6..bcaa9f1dd 100644
--- a/tests/tests_defaultcfg/defaultcfg_0.txt
+++ b/tests/tests_defaultcfg/defaultcfg_0.txt
@@ -1,8 +1,6 @@
 stats
 displayip
 postalert
-postdays
-posttarget
 discordalert
 discordwebhook
 emailalert
@@ -19,10 +17,13 @@ mailgunemail
 pushbulletalert
 pushbullettoken
 channeltag
-pushoveralert
-pushovertoken
+rocketchatalert
+rocketchatwebhook
+rocketchattoken
 slackalert
 slackwebhook
+pushoveralert
+pushovertoken
 telegramalert
 telegramtoken
 telegramchatid
@@ -38,6 +39,8 @@ sleeptime
 stopmode
 querymode
 querytype
+consoleverbose
+consoleinteract
 gamename
 engine
 glibc
diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
index 3d98b862f..6524907a8 100644
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.4.1"
+version="v20.5.0"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 35316674f..befa6c21c 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.4.1"
+version="v20.5.0"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"
diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
index 8b8cae16c..4a81e0aea 100644
--- a/tests/tests_mcserver.sh
+++ b/tests/tests_mcserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.4.1"
+version="v20.5.0"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index ff296e160..29ba2af77 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.4.1"
+version="v20.5.0"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"

From e794d89200ac637b5e903fbc310c779a1cf4d0f0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 20 Sep 2020 21:41:39 +0100
Subject: [PATCH 3/3] Release 20.5.0

---
 lgsm/functions/command_postdetails.sh | 2 +-
 lgsm/functions/info_config.sh         | 2 +-
 lgsm/functions/info_distro.sh         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/command_postdetails.sh b/lgsm/functions/command_postdetails.sh
index c819568f8..0f18b12a9 100755
--- a/lgsm/functions/command_postdetails.sh
+++ b/lgsm/functions/command_postdetails.sh
@@ -67,7 +67,7 @@ fn_print_ok_nl "termbin.com for 30D"
 fn_script_log_pass "termbin.com for 30D"
 pdurl="${link}"
 
-if [ ${firstcommandname} == "POST-DETAILS" ]; then
+if [ "${firstcommandname}" == "POST-DETAILS" ]; then
 	echo -e ""
 	echo -e "Please share the following url for support: "
 	echo -e "${pdurl}"
diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index c38e3e155..1ca69764d 100755
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -1248,7 +1248,7 @@ fn_info_config_sdtd(){
 	else
 		servername=$(grep "ServerName" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")
 		serverpassword=$(grep "ServerPassword" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")
-		port=$(grep "ServerPort" "${servercfgfullpath}" | egrep -o 'value="[0-9]+"' | tr -cd '[:digit:]')
+		port=$(grep "ServerPort" "${servercfgfullpath}" | grep -Eo 'value="[0-9]+"' | tr -cd '[:digit:]')
 		queryport=${port:-"0"}
 
 		webadminenabled=$(grep "ControlPanelEnabled" "${servercfgfullpath}" | sed 's/^.*value="//' | cut -f1 -d"\"")
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 97c806da2..8962426af 100755
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -264,11 +264,11 @@ if [ "$(command -v jq 2>/dev/null)" ]; then
 		if [ "${steammaster}" == "true" ]; then
 			# Will query server IP addresses first.
 			for queryip in "${queryips[@]}"; do
-				masterserver=$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)
+				masterserver="$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${queryip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
 			done
 			# Should that not work it will try the external IP.
 			if [ "${masterserver}" == "0" ]; then
-				masterserver=$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)
+				masterserver="$(curl -m 3 -s 'https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr='${extip}':'${port}'&format=json' | jq '.response.servers[]|.addr' | wc -l 2>/dev/null)"
 			fi
 			if [ "${masterserver}" == "0" ]; then
 				displaymasterserver="false"