Merge branch 'master' into develop

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": "",

lgsm/functions/alert_slack.sh

@@ -15,26 +15,20 @@ json=$(cat <<EOF
 {
 		"attachments": [
 			{
+				"color": "#36a64f",
 				"blocks": [
 					{
 										"type": "section",
 										"text": {
 												"type": "mrkdwn",
-						"text": "*${alertemoji} ${alertsubject} ${alertemoji}*"
+												"text": "*LinuxGSM Alert*"
 										}
 								},
 								{
 										"type": "section",
 										"text": {
 												"type": "mrkdwn",
-						"text": "*${servername}*"
-					}
-				},
-				{
-					"type": "section",
-					"text": {
-						"type": "mrkdwn",
-						"text": "${alertbody} \n More info: ${alerturl}"
+												"text": "*${alertemoji} ${alertsubject}* \n ${alertbody}"
 										}
 								},
 								{
@@ -50,17 +44,18 @@ json=$(cat <<EOF
 												{
 														"type": "mrkdwn",
 														"text": "*Server IP:* \n ${alertip}:${port}"
-						}
-					]
 												},
 												{
-					"type": "divider"
+														"type": "mrkdwn",
+														"text": "*Server Name:* \n ${servername}"
+												}
+										]
 								},
 					 {
 										"type": "section",
 										"text": {
 														"type": "mrkdwn",
-						"text": "*Hostname:* ${HOSTNAME}"
+														"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}"
 										}
 								}
 						]

lgsm/functions/command_postdetails.sh

@@ -67,14 +67,14 @@ 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}"
 fi
 fn_script_log_info "${pdurl}"
+alerturl="${pdurl}"
 
 if [ -z "${exitbypass}" ]; then
 	core_exit.sh
 fi
-alerturl="${pdurl}"

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
 

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}"

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"\"")

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"

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')

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"

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

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"

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"

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"

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"