From 450e0fc4235dec92f357fe9d74fe3be45aee7eb0 Mon Sep 17 00:00:00 2001
From: diamondburned <diamondburned@diamondb.xyz>
Date: Mon, 15 Oct 2018 20:16:15 -0700
Subject: [PATCH 01/29] Design tweaks and JSON-safe escaping string

---
 lgsm/functions/alert_discord.sh | 92 +++++++++++++++++----------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 4818f8721..75c8be2f0 100644
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -5,60 +5,62 @@
 # Website: https://linuxgsm.com
 # Description: Sends Discord alert.
 
+if ! command -v jq > /dev/null; then
+    fn_print_fail_nl "Sending Discord alert: jq is missing."
+    fn_script_log_fatal "Sending Discord alert: jq is missing."
+fi
+
+EscapedServername="$(echo -n "${servername}" | jq -sRr "@json")"
+EscapedAlertBody="$(echo -n "${alertbody}" | jq -sRr "@json")"
+
+echo "$servername" > /tmp/servername
+
 json=$(cat <<EOF
 {
-"username":"LinuxGSM",
-"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/data/alert_discord_logo.png",
-"file":"content",
+    "username":"LinuxGSM",
+    "avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/data/alert_discord_logo.png",
+    "file":"content",
 
-"embeds": [{
-	"color": "2067276",
-	"author": {"name": "${alertemoji} ${alertsubject} ${alertemoji}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-	"title": "",
-	"description": "",
-	"url": "",
-	"type": "content",
-	"thumbnail": {"url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-	"footer": {"text": "LinuxGSM", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-	"fields": [
-			{
-				"name": "Alert Message",
-				"value": "${alertbody}"
-			},
-			{
-				"name": "Game",
-				"value": "${gamename}"
-			},
-			{
-				"name": "Server name",
-				"value": "${servername}"
-			},
-			{
-				"name": "Hostname",
-				"value": "${HOSTNAME}"
-			},
-			{
-				"name": "Server IP",
-				"value": "[${extip:-$ip}:${port}](https://www.gametracker.com/server_info/${extip:-$ip}:${port})"
-			},
-			{
-				"name": "More info",
-				"value": "${alerturl}"
-			}
-		]
-	}]
+    "embeds": [{
+        "color": "2067276",
+        "author": {"name": "${alertemoji} ${alertsubject}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
+        "title": "",
+        "description": ${EscapedAlertBody},
+        "url": "",
+        "type": "content",
+        "thumbnail": {},
+        "footer": {"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}", "icon_url": ""},
+        "fields": [
+            {
+                "name": "Game",
+                "value": "${gamename}",
+                "inline": true
+            },
+            {
+                "name": "Server IP",
+                "value": "[${extip:-$ip}:${port}](https://www.gametracker.com/server_info/${extip:-$ip}:${port})",
+                "inline": true
+            },
+            {
+                "name": "Server name",
+                "value": ${EscapedServername},
+                "inline": true
+            }
+        ]
+    }]
 }
 EOF
 )
 
 fn_print_dots "Sending Discord alert"
-sleep 0.5
-discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d """${json}""" "${discordwebhook}")
+
+minified="$(echo -n "$json" | jq -c -M "@json")"
+discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "${json}" "${discordwebhook}")
 
 if [ -n "${discordsend}" ]; then
-	fn_print_fail_nl "Sending Discord alert: ${discordsend}"
-	fn_script_log_fatal "Sending Discord alert: ${discordsend}"
+    fn_print_fail_nl "Sending Discord alert: ${discordsend}"
+    fn_script_log_fatal "Sending Discord alert: ${discordsend}"
 else
-	fn_print_ok_nl "Sending Discord alert"
-	fn_script_log_pass "Sending Discord alert"
+    fn_print_ok_nl "Sending Discord alert"
+    fn_script_log_pass "Sending Discord alert"
 fi

From 4a6136e9ba1f69792c3b1c630d3c65310ca88613 Mon Sep 17 00:00:00 2001
From: diamondburned <diamondburned@diamondb.xyz>
Date: Mon, 15 Oct 2018 20:23:02 -0700
Subject: [PATCH 02/29] Fixed minify

---
 lgsm/functions/alert_discord.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 75c8be2f0..5de1df245 100644
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -54,8 +54,11 @@ EOF
 
 fn_print_dots "Sending Discord alert"
 
-minified="$(echo -n "$json" | jq -c -M "@json")"
-discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "${json}" "${discordwebhook}")
+minified="$(echo -n "$json" | jq -c .)"
+
+echo "$minified" > /tmp/json
+
+discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "${minified}" "${discordwebhook}")
 
 if [ -n "${discordsend}" ]; then
     fn_print_fail_nl "Sending Discord alert: ${discordsend}"

From 9fb6e69d76008e4a366bf4110b3ba40107beb876 Mon Sep 17 00:00:00 2001
From: diamondburned <diamondburned@diamondb.xyz>
Date: Fri, 26 Oct 2018 11:45:33 -0700
Subject: [PATCH 03/29] Minor changes to fit merge requirements

---
 lgsm/functions/alert_discord.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 5de1df245..9d7678baf 100644
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -10,10 +10,8 @@ if ! command -v jq > /dev/null; then
     fn_script_log_fatal "Sending Discord alert: jq is missing."
 fi
 
-EscapedServername="$(echo -n "${servername}" | jq -sRr "@json")"
-EscapedAlertBody="$(echo -n "${alertbody}" | jq -sRr "@json")"
-
-echo "$servername" > /tmp/servername
+escaped_servername="$(echo -n "${servername}" | jq -sRr "@json")"
+escaped_alertbody="$(echo -n "${alertbody}" | jq -sRr "@json")"
 
 json=$(cat <<EOF
 {
@@ -25,7 +23,7 @@ json=$(cat <<EOF
         "color": "2067276",
         "author": {"name": "${alertemoji} ${alertsubject}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
         "title": "",
-        "description": ${EscapedAlertBody},
+        "description": ${escaped_alertbody},
         "url": "",
         "type": "content",
         "thumbnail": {},
@@ -42,8 +40,8 @@ json=$(cat <<EOF
                 "inline": true
             },
             {
-                "name": "Server name",
-                "value": ${EscapedServername},
+                "name": "Server Name",
+                "value": ${escaped_servername},
                 "inline": true
             }
         ]
@@ -54,11 +52,7 @@ EOF
 
 fn_print_dots "Sending Discord alert"
 
-minified="$(echo -n "$json" | jq -c .)"
-
-echo "$minified" > /tmp/json
-
-discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "${minified}" "${discordwebhook}")
+discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
 
 if [ -n "${discordsend}" ]; then
     fn_print_fail_nl "Sending Discord alert: ${discordsend}"

From c266a2fa7378a3d1fe92c496f397be7ebda31ebf Mon Sep 17 00:00:00 2001
From: diamondburned <diamondburned@diamondb.xyz>
Date: Sat, 27 Oct 2018 14:59:46 -0700
Subject: [PATCH 04/29] Space -> Tab

Not sure if this will be JSON-friendly...
---
 lgsm/functions/alert_discord.sh | 74 ++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 9d7678baf..97e9ae2c1 100644
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 # LinuxGSM alert_discord.sh function
 # Author: Daniel Gibbs
-# Contributor: faflfama
+# Contributor: faflfama, diamondburned
 # Website: https://linuxgsm.com
 # Description: Sends Discord alert.
 
 if ! command -v jq > /dev/null; then
-    fn_print_fail_nl "Sending Discord alert: jq is missing."
-    fn_script_log_fatal "Sending Discord alert: jq is missing."
+	fn_print_fail_nl "Sending Discord alert: jq is missing."
+	fn_script_log_fatal "Sending Discord alert: jq is missing."
 fi
 
 escaped_servername="$(echo -n "${servername}" | jq -sRr "@json")"
@@ -15,37 +15,37 @@ escaped_alertbody="$(echo -n "${alertbody}" | jq -sRr "@json")"
 
 json=$(cat <<EOF
 {
-    "username":"LinuxGSM",
-    "avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/data/alert_discord_logo.png",
-    "file":"content",
+	"username":"LinuxGSM",
+	"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/data/alert_discord_logo.png",
+	"file":"content",
 
-    "embeds": [{
-        "color": "2067276",
-        "author": {"name": "${alertemoji} ${alertsubject}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-        "title": "",
-        "description": ${escaped_alertbody},
-        "url": "",
-        "type": "content",
-        "thumbnail": {},
-        "footer": {"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}", "icon_url": ""},
-        "fields": [
-            {
-                "name": "Game",
-                "value": "${gamename}",
-                "inline": true
-            },
-            {
-                "name": "Server IP",
-                "value": "[${extip:-$ip}:${port}](https://www.gametracker.com/server_info/${extip:-$ip}:${port})",
-                "inline": true
-            },
-            {
-                "name": "Server Name",
-                "value": ${escaped_servername},
-                "inline": true
-            }
-        ]
-    }]
+	"embeds": [{
+		"color": "2067276",
+		"author": {"name": "${alertemoji} ${alertsubject}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
+		"title": "",
+		"description": ${escaped_alertbody},
+		"url": "",
+		"type": "content",
+		"thumbnail": {},
+		"footer": {"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}", "icon_url": ""},
+		"fields": [
+			{
+				"name": "Game",
+				"value": "${gamename}",
+				"inline": true
+			},
+			{
+				"name": "Server IP",
+				"value": "[${extip:-$ip}:${port}](https://www.gametracker.com/server_info/${extip:-$ip}:${port})",
+				"inline": true
+			},
+			{
+				"name": "Server Name",
+				"value": ${escaped_servername},
+				"inline": true
+			}
+		]
+	}]
 }
 EOF
 )
@@ -55,9 +55,9 @@ fn_print_dots "Sending Discord alert"
 discordsend=$(${curlpath} -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "$json" | jq -c .)" "${discordwebhook}")
 
 if [ -n "${discordsend}" ]; then
-    fn_print_fail_nl "Sending Discord alert: ${discordsend}"
-    fn_script_log_fatal "Sending Discord alert: ${discordsend}"
+	fn_print_fail_nl "Sending Discord alert: ${discordsend}"
+	fn_script_log_fatal "Sending Discord alert: ${discordsend}"
 else
-    fn_print_ok_nl "Sending Discord alert"
-    fn_script_log_pass "Sending Discord alert"
+	fn_print_ok_nl "Sending Discord alert"
+	fn_script_log_pass "Sending Discord alert"
 fi

From c8d88c718cbf1bd6d856720a3674b1be898783b0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 28 Oct 2018 11:00:14 +0000
Subject: [PATCH 05/29] restored legacy free command so older distros can use
 it if numfmt is unavailable

---
 lgsm/functions/info_distro.sh | 82 ++++++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 25 deletions(-)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 8716bb9f8..36f06c4bf 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -91,33 +91,65 @@ load=$(uptime|awk -F 'load average: ' '{ print $2 }')
 
 ## Memory information
 
-# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated
-
-# get the raw KB values of these fields
-physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
-physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}')
-physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}')
-physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}')
-physmemreclaimablekb=$(grep ^SReclaimable /proc/meminfo | awk '{print $2}')
-
-# check if MemAvailable Exists
-if grep -q ^MemAvailable /proc/meminfo; then
-    physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
-else
-    physmemactualfreekb=$((${physmemfreekb}+${physmembufferskb}+${physmemcachedkb}))
-fi
 
+## Memory information
 # Available RAM and swap.
-physmemtotalmb=$((${physmemtotalkb}/1024))
-physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")
-physmemfree=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
-physmemused=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemtotalkb}-${physmemfreekb}-${physmembufferskb}-${physmemcachedkb}-${physmemreclaimablekb}))K")
-physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
-physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemcachedkb}+${physmemreclaimablekb}))K")
-
-swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K")
-swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K")
-swapused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K")
+
+# Newer distros can use numfmt to give more accurate results
+if [ -n "$(command -v numfmt 2>/dev/null)" ]; then
+	# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated
+
+	# get the raw KB values of these fields
+	physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+	physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}')
+	physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}')
+	physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}')
+	physmemreclaimablekb=$(grep ^SReclaimable /proc/meminfo | awk '{print $2}')
+
+	# check if MemAvailable Exists
+	if grep -q ^MemAvailable /proc/meminfo; then
+	    physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
+	else
+	    physmemactualfreekb=$((${physmemfreekb}+${physmembufferskb}+${physmemcachedkb}))
+	fi
+
+	# Available RAM and swap.
+	physmemtotalmb=$((${physmemtotalkb}/1024))
+	physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")
+	physmemfree=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
+	physmemused=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemtotalkb}-${physmemfreekb}-${physmembufferskb}-${physmemcachedkb}-${physmemreclaimablekb}))K")
+	physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
+	physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemcachedkb}+${physmemreclaimablekb}))K")
+
+	swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K")
+	swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K")
+	swapused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^SwapTotal /proc/meminfo | awk '{print $2}')-$(grep ^SwapFree /proc/meminfo | awk '{print $2}')))K")
+else
+# Older distros will need to use free.
+	# Older versions of free do not support -h option.
+	if [ "$(free -h > /dev/null 2>&1; echo $?)" -ne "0" ]; then
+		humanreadable="-m"
+	else
+		humanreadable="-h"
+	fi
+	physmemtotalmb=$(free -m | awk '/Mem:/ {print $2}')
+	physmemtotal=$(free ${humanreadable} | awk '/Mem:/ {print $2}')
+	physmemfree=$(free ${humanreadable} | awk '/Mem:/ {print $4}')
+	physmemused=$(free ${humanreadable} | awk '/Mem:/ {print $3}')
+
+	oldfree=$(free ${humanreadable} | awk '/cache:/')
+	if [ -n "${oldfree}" ]; then
+		physmemavailable="n/a"
+		physmemcached="n/a"
+	else
+		physmemavailable=$(free ${humanreadable} | awk '/Mem:/ {print $7}')
+		physmemcached=$(free ${humanreadable} | awk '/Mem:/ {print $6}')
+	fi
+
+	swaptotal=$(free ${humanreadable} | awk '/Swap:/ {print $2}')
+	swapused=$(free ${humanreadable} | awk '/Swap:/ {print $3}')
+	swapfree=$(free ${humanreadable} | awk '/Swap:/ {print $4}')
+fi
 
 ### Disk information
 

From 69ac5c81ed13bd56c243559967200c758c2223c6 Mon Sep 17 00:00:00 2001
From: Attila <borzak.attila@gmail.com>
Date: Wed, 31 Oct 2018 01:52:01 +0100
Subject: [PATCH 06/29] Add some default mapgroup examples to csgoserver

There is no default specific mapgroup for Custom and Wingman.
---
 .../config-lgsm/csgoserver/_default.cfg          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index c19233e41..1a66b5dab 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -10,14 +10,14 @@
 
 ## 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
-# Custom				3			0
-# Deathmatch			1			2
-# Demolition			1			1
-# Wingman				0			2
+# [Game Modes]			gametype	gamemode    mapgroup (you can mix these across Game Modes, but use only one)
+# Arms Race				1			0           mg_armsrace
+# Classic Casual		0			0           mg_casualsigma, mg_casualdelta
+# Classic Competitive	0			1           mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom				3			0           
+# Deathmatch			1			2           mg_deathmatch
+# Demolition			1			1           mg_demolition
+# Wingman				0			2           
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From a53124af37542b1366d056a36f7c66d55a7a3611 Mon Sep 17 00:00:00 2001
From: Attila <borzak.attila@gmail.com>
Date: Wed, 31 Oct 2018 12:41:52 +0100
Subject: [PATCH 07/29] Using tabs instead of spaces

---
 .../config-lgsm/csgoserver/_default.cfg          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index 1a66b5dab..b6f1de61a 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -10,14 +10,14 @@
 
 ## 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    mapgroup (you can mix these across Game Modes, but use only one)
-# Arms Race				1			0           mg_armsrace
-# Classic Casual		0			0           mg_casualsigma, mg_casualdelta
-# Classic Competitive	0			1           mg_active, mg_reserves, mg_hostage, mg_de_dust2
-# Custom				3			0           
-# Deathmatch			1			2           mg_deathmatch
-# Demolition			1			1           mg_demolition
-# Wingman				0			2           
+# [Game Modes]			gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
+# Arms Race				1			0			mg_armsrace
+# Classic Casual		0			0			mg_casualsigma, mg_casualdelta
+# Classic Competitive	0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom				3			0			
+# Deathmatch			1			2			mg_deathmatch
+# Demolition			1			1			mg_demolition
+# Wingman				0			2			
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From bdf36f63aa9702d0d36d5b9073e6d129bb80a920 Mon Sep 17 00:00:00 2001
From: 007a83 <007a83@gmail.com>
Date: Tue, 13 Nov 2018 15:10:01 -0800
Subject: [PATCH 08/29] Fixed Discord Profile Picture

The location of the Discord Profile Picture was incorrect.
---
 lgsm/functions/alert_discord.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 4818f8721..9bda41b9b 100644
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -8,7 +8,7 @@
 json=$(cat <<EOF
 {
 "username":"LinuxGSM",
-"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/data/alert_discord_logo.png",
+"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png",
 "file":"content",
 
 "embeds": [{

From 87d8ab88babdaa2ad828361ad298ef217b4a9016 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 14 Nov 2018 13:30:18 +0000
Subject: [PATCH 09/29] lined up examples

---
 .../config-lgsm/csgoserver/_default.cfg          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index b6f1de61a..61a4f02d5 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -10,14 +10,14 @@
 
 ## 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	mapgroup (you can mix these across Game Modes, but use only one)
-# Arms Race				1			0			mg_armsrace
-# Classic Casual		0			0			mg_casualsigma, mg_casualdelta
-# Classic Competitive	0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
-# Custom				3			0			
-# Deathmatch			1			2			mg_deathmatch
-# Demolition			1			1			mg_demolition
-# Wingman				0			2			
+# [Game Modes]			  gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
+# Arms Race           1         0         mg_armsrace
+# Classic Casual		  0			    0			    mg_casualsigma, mg_casualdelta
+# Classic Competitive	0			    1		      mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom				      3			    0			
+# Deathmatch			    1			    2			    mg_deathmatch
+# Demolition			    1			    1			    mg_demolition
+# Wingman				      0			    2			
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From 1e57f8e25c08373b7a483cedcb670e55416a07a1 Mon Sep 17 00:00:00 2001
From: Attila <borzak.attila@gmail.com>
Date: Fri, 16 Nov 2018 14:01:46 +0100
Subject: [PATCH 10/29] GOKZ and TTT are only CS:GO mods

With the previous "source" Supported Engines option they were listed in every source games (for example in tf2server), which are not supported by these mods. Thx to Lamiiku for finding this.
---
 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 dcc2fbecf..eb1e2f8bf 100644
--- a/lgsm/functions/mods_list.sh
+++ b/lgsm/functions/mods_list.sh
@@ -61,8 +61,8 @@ mod_info_metamod=( MOD "metamod" "MetaMod" "${metamodurl}" "${metamodlatestfile}
 mod_info_sourcemod=( MOD "sourcemod" "SourceMod" "${sourcemodurl}" "${sourcemodlatestfile}" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "GAMES" "NOTGAMES" "http://www.sourcemod.net" "Admin Features (requires MetaMod)" )
 
 # CS:GO Mods
-mod_info_gokz=( MOD "gokz" "GOKZ" "https://bitbucket.org/kztimerglobalteam/gokz/downloads/GOKZ-latest.zip" "gokz-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "Counter Strike: Global Offensive" "NOTGAMES" "https://bitbucket.org/kztimerglobalteam/gokz/src/master/" "Implements the KZ game mode (requires SourceMod and MetaMod)")
-mod_info_ttt=( MOD "ttt" "Trouble in Terrorist Town" "https://csgottt.com/downloads/ttt-latest-dev-${sourcemodmversion}.zip" "ttt-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "source;" "Counter Strike: Global Offensive" "NOTGAMES" "https://github.com/Bara/TroubleinTerroristTown" "Implements the TTT game mode (requires SourceMod and MetaMod)")
+mod_info_gokz=( MOD "gokz" "GOKZ" "https://bitbucket.org/kztimerglobalteam/gokz/downloads/GOKZ-latest.zip" "gokz-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter Strike: Global Offensive" "NOTGAMES" "https://bitbucket.org/kztimerglobalteam/gokz/src/master/" "Implements the KZ game mode (requires SourceMod and MetaMod)")
+mod_info_ttt=( MOD "ttt" "Trouble in Terrorist Town" "https://csgottt.com/downloads/ttt-latest-dev-${sourcemodmversion}.zip" "ttt-latest.zip" "0" "LowercaseOff" "${systemdir}" "cfg;addons/sourcemod/configs;" "ENGINES" "Counter Strike: Global Offensive" "NOTGAMES" "https://github.com/Bara/TroubleinTerroristTown" "Implements the TTT game mode (requires SourceMod and MetaMod)")
 
 # Garry's Mod Addons
 mod_info_ulib=( MOD "ulib" "ULib" "https://codeload.github.com/TeamUlysses/ulib/zip/master" "ulib-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Complete Framework" )

From 9b227c3392afe392987594e20345285afc61a073 Mon Sep 17 00:00:00 2001
From: Attila <borzak.attila@gmail.com>
Date: Fri, 16 Nov 2018 14:38:38 +0100
Subject: [PATCH 11/29] Create .editorconfig to help coding conventions

Feel free to edit this PR to match the conventions used in this repo. I tried to figure out, but maybe somewhere I didn't get right.
---
 .editorconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..ef3ef8bd9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs.
+# Atom: Please assure your Atom's config setting Tab Type is set to auto, otherwise Atom-EditorConfig may not work as expected. Also disable whitespace package.
+# http://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true

From 18a2713ce5bf82f45a9fd40becc197e8befd07ed Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 17 Nov 2018 23:01:33 +0000
Subject: [PATCH 12/29] re-ordered glibc info

---
 lgsm/functions/info_glibc.sh | 77 +++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh
index f3597cbf8..dda76577c 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -12,9 +12,6 @@ if [ "${gamename}" == "ARK: Survival Evolved" ]; then
 elif [ "${gamename}" == "Ballistic Overkill" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
-elif [ "${gamename}" == "Battalion 1944" ]; then
-	glibcrequired="2.17"
-	glibcfix="no"
 elif [ "${gamename}" == "Base Defense" ]; then
 	glibcrequired="2.14"
 	glibcfix="no"
@@ -129,31 +126,34 @@ elif [ "${gamename}" == "Just Cause 2" ]; then
 elif [ "${gamename}" == "Just Cause 3" ]; then
 	glibcrequired="2.17"
 	glibcfix="no"
-elif [ "${engine}" == "dontstarve" ]; then
+elif [ "${gamename}" == "Natural Selection 2" ]; then
+	glibcrequired="2.17"
+	glibcfix="no"
+elif [ "${gamename}" == "NS2: Combat" ]; then
 	glibcrequired="2.15"
+	glibcfix="yes"
+elif [ "${gamename}" == "TeamSpeak 3" ]; then
+	glibcrequired="NOT REQUIRED"
 	glibcfix="no"
-elif [ "${engine}" == "lwjgl2" ]; then
+elif [ "${gamename}" == "Mumble" ]; then
 	glibcrequired="NOT REQUIRED"
 	glibcfix="no"
-elif [ "${engine}" == "projectzomboid" ]; then
-	glibcrequired="2.15"
+elif [ "${engine}" == "refractor" ]; then
+	glibcrequired="2.0"
 	glibcfix="no"
-elif [ "${engine}" == "realvirtuality" ]; then
-	glibcrequired="2.13"
-	glibcfix="yes"
-elif [ "${engine}" == "seriousengine35" ]; then
-	glibcrequired="2.13"
-	glibcfix="yes"
-elif [ "${engine}" == "source" ]; then
-	glibcrequired="2.3.6"
+elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
+	glibcrequired="2.2.4"
 	glibcfix="no"
-elif [ "${engine}" == "goldsource" ]; then
-	glibcrequired="2.3.4"
+elif [ "${gamename}" == "ET: Legacy" ]; then
+	glibcrequired="2.7"
 	glibcfix="no"
-elif [ "${gamename}" == "Natural Selection 2" ]; then
-	glibcrequired="2.17"
+elif [ "${gamename}" == "Wurm Unlimited" ]; then
+	glibcrequired="2.14"
 	glibcfix="no"
-elif [ "${gamename}" == "NS2: Combat" ]; then
+elif [ "${gamename}" == "Multi Theft Auto" ]; then
+	glibcrequired="2.7"
+	glibcfix="no"
+elif [ "${gamename}" == "Zombie Panic! Source" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
 elif [ "${engine}" == "starbound" ]; then
@@ -175,35 +175,32 @@ elif [ "${engine}" == "unreal3" ]; then
 	glibcrequired="2.3.2"
 	glibcfix="no"
 elif [ "${engine}" == "unreal4" ]; then
-	glibcrequired="2.14"
+	glibcrequired="2.17"
 	glibcfix="no"
 elif [ "${engine}" == "unity3d" ]; then
 	glibcrequired="2.15"
 	glibcfix="no"
-elif [ "${gamename}" == "TeamSpeak 3" ]; then
-	glibcrequired="NOT REQUIRED"
+elif [ "${engine}" == "dontstarve" ]; then
+	glibcrequired="2.15"
 	glibcfix="no"
-elif [ "${gamename}" == "Mumble" ]; then
+elif [ "${engine}" == "lwjgl2" ]; then
 	glibcrequired="NOT REQUIRED"
 	glibcfix="no"
-elif [ "${engine}" == "refractor" ]; then
-	glibcrequired="2.0"
-	glibcfix="no"
-elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
-	glibcrequired="2.2.4"
-	glibcfix="no"
-elif [ "${gamename}" == "ET: Legacy" ]; then
-	glibcrequired="2.7"
-	glibcfix="no"
-elif [ "${gamename}" == "Wurm Unlimited" ]; then
-	glibcrequired="2.14"
-	glibcfix="no"
-elif [ "${gamename}" == "Multi Theft Auto" ]; then
-	glibcrequired="2.7"
-	glibcfix="no"
-elif [ "${gamename}" == "Zombie Panic! Source" ]; then
+elif [ "${engine}" == "projectzomboid" ]; then
 	glibcrequired="2.15"
+	glibcfix="no"
+elif [ "${engine}" == "realvirtuality" ]; then
+	glibcrequired="2.13"
 	glibcfix="yes"
+elif [ "${engine}" == "seriousengine35" ]; then
+	glibcrequired="2.13"
+	glibcfix="yes"
+elif [ "${engine}" == "source" ]; then
+	glibcrequired="2.3.6"
+	glibcfix="no"
+elif [ "${engine}" == "goldsource" ]; then
+	glibcrequired="2.3.4"
+	glibcfix="no"	
 else
 	glibcrequired="UNKNOWN"
 	glibcfix="no"

From d79bf048a641824e570135aa324d1a569d934fe3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 17 Nov 2018 23:26:30 +0000
Subject: [PATCH 13/29] updated tower unite glibc

---
 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 dda76577c..015c1e169 100644
--- a/lgsm/functions/info_glibc.sh
+++ b/lgsm/functions/info_glibc.sh
@@ -75,6 +75,9 @@ elif [ "${gamename}" == "Insurgency" ]; then
 elif [ "${shortname}" == "kf2" ]; then
 	glibcrequired="2.17"
 	glibcfix="no"
+elif [ "${shortname}" == "tu" ]; then
+	glibcrequired="2.15"
+	glibcfix="no"	
 elif [ "${gamename}" == "Mumble" ]; then
 	glibcrequired="NOT REQUIRED"
 	glibcfix="no"

From b03069d2341266c55544707a80a6b61b52487207 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 19 Nov 2018 23:20:32 +0000
Subject: [PATCH 14/29] Feature/inssserver 2004 (#2079)

* Added insurgency: Sandstorm
* gamedig will now attempt to use --port if --query_port fails
* Stopped gamedig from querying twice
* Added Default Scenario
* Added Current Scenario
* added current gamemode
* Updated servername for parms
* if serverpassword NOT SET unset var for display on Command-line Parameters
---
 .../config-lgsm/hwserver/_default.cfg         |   2 +-
 .../config-lgsm/inssserver/_default.cfg       | 134 ++++++++++++++++++
 .../config-lgsm/ns2cserver/_default.cfg       |   2 +-
 .../config-lgsm/ns2server/_default.cfg        |   2 +-
 .../config-lgsm/pstbsserver/_default.cfg      |   2 +-
 lgsm/data/serverlist.csv                      |   1 +
 lgsm/functions/check_ip.sh                    |   6 +-
 lgsm/functions/command_dev_query_raw.sh       |   2 +-
 lgsm/functions/info_config.sh                 |  28 +++-
 lgsm/functions/info_messages.sh               |  31 ++++
 lgsm/functions/info_parms.sh                  |  13 +-
 lgsm/functions/query_gamedig.sh               |  20 ++-
 12 files changed, 230 insertions(+), 13 deletions(-)
 create mode 100644 lgsm/config-default/config-lgsm/inssserver/_default.cfg

diff --git a/lgsm/config-default/config-lgsm/hwserver/_default.cfg b/lgsm/config-default/config-lgsm/hwserver/_default.cfg
index fa4742cbb..a2335e8ec 100644
--- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg
@@ -9,7 +9,7 @@
 #### Server Settings ####
 
 ## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
-servername="Hurtworld LinuxGSM Server"
+servername="LinuxGSM Server"
 ip="0.0.0.0"
 port="12871"
 queryport="12881"
diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
new file mode 100644
index 000000000..9025c5e35
--- /dev/null
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -0,0 +1,134 @@
+##################################
+######## 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 Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
+
+ip="0.0.0.0"
+port="27102"
+queryport="27131"
+servername="LinuxGSM Server"
+serverpassword=""
+defaultmap="Oilfield"
+defaultscenario="Scenario_Oilfield_Push_Security"
+maxplayers="28"
+
+## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
+fn_parms(){
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -password=${serverpassword} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -log"
+}
+
+#### 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
+# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring".
+# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need
+# any custom string in curl - simple ignore this parameter.
+telegramalert="off"
+telegramtoken="accesstoken"
+telegramchatid=""
+curlcustomstring=""
+
+## 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 ####
+
+# ANSI Colors
+ansi="on"
+
+## SteamCMD Settings
+# Server appid
+appid="581330"
+# 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="Insurgency: Sandstorm"
+engine="unreal4"
+
+#### Directories ####
+# Edit with care
+
+## Server Specific Directories
+systemdir="${serverfiles}/Insurgency"
+executabledir="${systemdir}/Binaries/Linux"
+executable="./InsurgencyServer-Linux-Shipping"
+servercfg="Game.ini"
+servercfgdefault="Game.ini"
+servercfgdir="${systemdir}/Saved/Config/LinuxServer"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${lgsmdir}/backup"
+
+## Logging Directories
+logdir="${rootdir}/log"
+gamelogdir="${systemdir}/Saved/Logs"
+lgsmlogdir="${logdir}/script"
+consolelogdir="${logdir}/console"
+gamelog="${gamelogdir}/${servicename}-game.log"
+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"
diff --git a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
index b3b4b1caa..dfb4844a1 100644
--- a/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
@@ -13,7 +13,7 @@ ip="0.0.0.0"
 port="27015"
 defaultmap="co_core"
 maxplayers="24"
-servername="NS2C Server"
+servername="LinuxGSM Server"
 webadminuser="admin"
 webadminpass="admin"
 webadminport="8080"
diff --git a/lgsm/config-default/config-lgsm/ns2server/_default.cfg b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
index b842091a5..fea5a772c 100644
--- a/lgsm/config-default/config-lgsm/ns2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ns2server/_default.cfg
@@ -17,7 +17,7 @@ ip="0.0.0.0"
 port="27015"
 defaultmap="ns2_summit"
 maxplayers="24"
-servername="NS2 Server"
+servername="LinuxGSM Server"
 webadminuser="admin"
 webadminpass="admin"
 webadminport="8080"
diff --git a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
index 8f472ce6b..7d1fb6b97 100644
--- a/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pstbsserver/_default.cfg
@@ -14,7 +14,7 @@ ip="0.0.0.0"
 randommap="ALWAYS"
 port="10027"
 queryport="10037"
-#servername="LinuxGSM server"
+#servername="LinuxGSM Server"
 # If your server is not meeting the minimal server requirement, do not host the server for 80 players, decrease that number.
 maxplayers="40"
 numreservedslots="2"
diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
index 12bb0532c..2a55c4122 100644
--- a/lgsm/data/serverlist.csv
+++ b/lgsm/data/serverlist.csv
@@ -36,6 +36,7 @@ hldms,hldmsserver,Half-Life Deathmatch: Source
 hldm,hldmserver,Half-Life: Deathmatch
 hw,hwserver,Hurtworld
 ins,insserver,Insurgency
+inss,inssserver,Insurgency: Sandstorm
 jc2,jc2server,Just Cause 2
 jc3,jc3server,Just Cause 3
 kf,kfserver,Killing Floor
diff --git a/lgsm/functions/check_ip.sh b/lgsm/functions/check_ip.sh
index ba2d472c1..992fd0e93 100644
--- a/lgsm/functions/check_ip.sh
+++ b/lgsm/functions/check_ip.sh
@@ -21,7 +21,7 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi
 	# IP is not set to specific IP
 	if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 		fn_print_dots "Check IP"
-		sleep 0.5
+		sleep 0.2
 		# Multiple interfaces
 		if [ "${getipwc}" -ge "2" ]; then
 			if [ "${function_selfname}" == "command_details.sh" ]; then
@@ -29,7 +29,7 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi
 			else
 			    fn_print_fail "Check IP: Multiple IP addresses found."
 			fi
-			sleep 0.5
+			sleep 0.2
 			echo -en "\n"
 			# IP is set within game config
 			if [ "${ipsetinconfig}" == "1" ]; then
@@ -85,7 +85,7 @@ if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${gamename}" != "Mumble" ]&&[ "${travi
 		else
 			fn_print_info_nl "Check IP: ${getip}"
 			fn_script_log_info "IP automatically set as: ${getip}"
-			sleep 0.5
+			sleep 0.2
 			ip="${getip}"
 		fi
 	fi
diff --git a/lgsm/functions/command_dev_query_raw.sh b/lgsm/functions/command_dev_query_raw.sh
index 2dc39b951..c16d517aa 100644
--- a/lgsm/functions/command_dev_query_raw.sh
+++ b/lgsm/functions/command_dev_query_raw.sh
@@ -29,7 +29,7 @@ elif [ "${gamename}" == "Killing Floor 2" ]; then
 fi
 
 query_gamedig.sh
-echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --query_port \"${queryport}\"|jq"
+echo "${gamedigcmd}"
 echo""
 echo "${gamedigraw}" | jq
 echo""
diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh
index 97ba4eb1d..632dc44ea 100644
--- a/lgsm/functions/info_config.sh
+++ b/lgsm/functions/info_config.sh
@@ -297,6 +297,29 @@ fn_info_config_factorio(){
 	fi
 }
 
+fn_info_config_inss(){
+	if [ ! -f "${servercfgfullpath}" ]; then
+		rconenabled="${unavailable}"
+		rconpassword="${unavailable}"
+		rconport="${zero}"
+		maxplayers="${zero}"
+		port="${zero}"
+		queryport="${zero}"
+		queryenabled="${unavailable}"
+		rconport="${zero}"
+		gamemode="${unavailable}"
+		gameworld="${unavailable}"
+	else
+		rconenabled=$(grep "bEnabled" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/bEnabled//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		rconpassword=$(grep "Password" "${servercfgfullpath}" | sed -e 's/^[ \t]*//g' -e '/^#/d' -e 's/Password//g' | tr -d '=\";,:' | sed -e 's/^[ \t]*//' -e 's/[ \t]*$//')
+		rconport=$(grep "ListenPort" "${servercfgfullpath}" | tr -cd '[:digit:]')
+
+		# Not Set
+		rconenabled=${rconenabled:-"NOT SET"}
+		rconpassword=${rconpassword:-"NOT SET"}
+		rconport=${rconport:-"0"}
+	fi	
+}
 fn_info_config_minecraft(){
 	if [ ! -f "${servercfgfullpath}" ]; then
 		servername="${unavailable}"
@@ -364,7 +387,7 @@ fn_info_config_pstbs(){
 	servername=${servername:-"NOT SET"}
 	serverpassword=${serverpassword:-"NOT SET"}
 	maxplayers=${maxplayers:-"0"}
-	numreservedslots=${maxplayers:-"0"}
+	numreservedslots=${numreservedslots:-"0"}
 }
 
 fn_info_config_projectcars(){
@@ -1121,6 +1144,9 @@ elif [ "${shortname}" == "eco" ]; then
 # Factorio
 elif [ "${gamename}" == "Factorio" ]; then
 	fn_info_config_factorio
+# Insurgency: Sandstorm
+elif [ "${shortname}" == "inss" ]; then
+	fn_info_config_inss
 # Just Cause 2
 elif [ "${gamename}" == "Just Cause 2" ]; then
 	fn_info_config_justcause2
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 996559796..03ebcda49 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -225,11 +225,25 @@ fn_info_message_gameserver(){
 			echo -e "${blue}Current Map:\t${default}${gdmap}"
 		fi
 
+		if [ -n "${defaultscenario}" ]; then
+			# Current Scenario
+			if [ -n "${gdgamemode}" ]; then
+				echo -e "${blue}Current Scenario:\t${default}${gdgamemode}"
+			fi
+		else
+			echo -e "${blue}Current Game Mode:\t${default}${gdgamemode}"
+		fi
+
 		# Default Map
 		if [ -n "${defaultmap}" ]; then
 			echo -e "${blue}Default Map:\t${default}${defaultmap}"
 		fi
 
+		# Default Scenario
+		if [ -n "${defaultscenario}" ]; then
+			echo -e "${blue}Default Scenario:\t${default}${defaultscenario}"
+		fi
+
 		# Game type
 		if [ -n "${gametype}" ]; then
 			echo -e "${blue}Game type:\t${default}${gametype}"
@@ -444,6 +458,10 @@ fn_info_message_commandlineparms(){
 	echo -e "${lightgreen}Command-line Parameters${default}"
 	fn_info_message_password_strip
 	fn_messages_separator
+	if [ "${serverpassword}" == "NOT SET" ]; then
+		unset serverpassword
+	fi
+	fn_parms
 	echo -e "${executable} ${parms}"
 }
 
@@ -677,6 +695,17 @@ fn_info_message_hurtworld(){
 	} | column -s $'\t' -t
 }
 
+fn_info_message_inss(){
+	echo -e "netstat -atunp | grep Insurgency"
+	echo -e ""
+	{
+		echo -e "DESCRIPTION\tDIRECTION\tPORT\tPROTOCOL"
+		echo -e "> Game\tINBOUND\t${port}\tudp"
+		echo -e "> Query\tINBOUND\t${queryport}\tudp"
+		echo -e "> RCON\tINBOUND\t${rconport}\ttcp"
+	} | column -s $'\t' -t
+}
+
 fn_info_message_justcause2(){
 	echo -e "netstat -atunp | grep Jcmp-Server"
 	echo -e ""
@@ -1144,6 +1173,8 @@ fn_info_message_select_engine(){
 		fn_info_message_factorio
 	elif [ "${gamename}" == "Hurtworld" ]; then
 		fn_info_message_hurtworld
+	elif [ "${shortname}" == "inss" ]; then
+		fn_info_message_inss
 	elif [ "${gamename}" == "Just Cause 2" ]; then
 		fn_info_message_justcause2
 	elif [ "${gamename}" == "Just Cause 3" ]; then
diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh
index f1ecf21f7..696ba8396 100644
--- a/lgsm/functions/info_parms.sh
+++ b/lgsm/functions/info_parms.sh
@@ -45,13 +45,22 @@ fn_info_parms_eco(){
 	queryport=${webadminport}
 }
 
-
 fn_info_parms_factorio(){
 	port=${port:-"0"}
 	rconport=${rconport:-"0"}
 	rconpassword=${rconpassword:-"NOT SET"}
 }
 
+fn_info_parms_inss(){
+	port=${port:-"0"}
+	queryport=${queryport:-"0"}
+	servername=${servername:-"NOT SET"}
+	serverpassword=${serverpassword:-"NOT SET"}
+	defaultmap=${defaultmap:-"NOT SET"}
+	defaultscenario=${defaultscenario:-"NOT SET"}
+	maxplayers=${maxplayers:-"0"}
+}
+
 fn_info_parms_hurtworld(){
 	servername=${servername:-"NOT SET"}
 	port=${port:-"0"}
@@ -158,6 +167,8 @@ elif [ "${gamename}" == "Eco" ]; then
 # Factorio
 elif [ "${gamename}" == "Factorio" ]; then
 	fn_info_parms_factorio
+elif [ "${shortname}" == "inss" ]; then
+	fn_info_parms_inss
 elif [ "${shortname}" == "kf2" ]; then
 	fn_info_parms_kf2
 # Project Zomboid
diff --git a/lgsm/functions/query_gamedig.sh b/lgsm/functions/query_gamedig.sh
index b8cad6159..1bdce107a 100644
--- a/lgsm/functions/query_gamedig.sh
+++ b/lgsm/functions/query_gamedig.sh
@@ -73,10 +73,18 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 	# will bypass query if server offline
 	check_status.sh
 	if [ "${status}" != "0" ]; then
-		# checks if query is working 0 = pass
-		querystatus=$(gamedig --type "${gamedigengine}" --host "${ip}" --query_port "${queryport}" | jq '.error|length')
-		# raw output
+		# checks if query is working null = pass
+		gamedigcmd=$(echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --query_port \"${queryport}\"|jq")
 		gamedigraw=$(gamedig --type "${gamedigengine}" --host "${ip}" --query_port "${queryport}")
+		querystatus=$(echo "${gamedigraw}" | jq '.error|length')
+		
+		if [ "${querystatus}" != "null" ]; then
+			gamedigcmd=$(echo "gamedig --type \"${gamedigengine}\" --host \"${ip}\" --port \"${queryport}\"|jq")
+			gamedigraw=$(gamedig --type "${gamedigengine}" --host "${ip}" --port "${queryport}")
+			querystatus=$(echo "${gamedigraw}" | jq '.error|length')
+			
+		fi	
+		
 
 		# server name
 		gdname=$(echo "${gamedigraw}" | jq -re '.name')
@@ -102,6 +110,12 @@ if [ "$(command -v gamedig 2>/dev/null)" ]&&[ "$(command -v jq 2>/dev/null)" ];
 			gdmap=
 		fi
 
+		# current gamemode
+		gdgamemode=$(echo "${gamedigraw}" | jq -re '.raw.rules.GameMode_s')
+		if [ "${gdgamemode}" == "null" ]; then
+			gdgamemode=
+		fi
+
 		# numbots
 		gdbots=$(echo "${gamedigraw}" | jq -re '.raw.numbots')
 		if [ "${gdbots}" == "null" ]; then

From 60bba862592bd8c4a8f9e522098ea2d9785a43e0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 20 Nov 2018 21:36:48 +0000
Subject: [PATCH 15/29] adjusted inss parms for ports as recommended

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

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index 9025c5e35..6681a49a6 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -21,7 +21,7 @@ maxplayers="28"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers} -password=${serverpassword} -Port=${port} -QueryPort=${queryport} -hostname='${servername}' -log"
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}  -password=${serverpassword} -hostname='${servername}' -log"
 }
 
 #### LinuxGSM Settings ####

From 8983d67599366850429607b0cfe6e942dd94e2e5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Tue, 20 Nov 2018 21:41:36 +0000
Subject: [PATCH 16/29] removed duplicate Server IP line

---
 lgsm/functions/command_debug.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lgsm/functions/command_debug.sh b/lgsm/functions/command_debug.sh
index 453c42894..23cb49f4b 100644
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@@ -56,7 +56,6 @@ if [ "${multiple_ip}" == "1" ]; then
 else
 	echo -e "${blue}Server IP:\t${default}${ip}:${port}"
 fi
-echo -e "${blue}Server IP:\t${default}${ip}:${port}"
 # External server ip
 if [ -n "${extip}" ]; then
 	if [ "${ip}" != "${extip}" ]; then

From d19f11b4d5476eb16fb5e6f0e67acd8e810fa16f Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 11:57:16 +0000
Subject: [PATCH 17/29] examples lined up using tabs

---
 .../config-lgsm/csgoserver/_default.cfg          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
index 61a4f02d5..7cbdb93f6 100644
--- a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -10,14 +10,14 @@
 
 ## 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	mapgroup (you can mix these across Game Modes, but use only one)
-# Arms Race           1         0         mg_armsrace
-# Classic Casual		  0			    0			    mg_casualsigma, mg_casualdelta
-# Classic Competitive	0			    1		      mg_active, mg_reserves, mg_hostage, mg_de_dust2
-# Custom				      3			    0			
-# Deathmatch			    1			    2			    mg_deathmatch
-# Demolition			    1			    1			    mg_demolition
-# Wingman				      0			    2			
+# [Game Modes]			gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
+# Arms Race				1			0			mg_armsrace
+# Classic Casual		0			0			mg_casualsigma, mg_casualdelta
+# Classic Competitive	0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom				3			0
+# Deathmatch			1			2			mg_deathmatch
+# Demolition			1			1			mg_demolition
+# Wingman				0			2			
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

From 6bb004fa83c4128c026c5f941310d4edabc75758 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 12:28:03 +0000
Subject: [PATCH 18/29] Added new default maps and new parameters

-automanagedmods
AltSaveDirectoryName=
---
 lgsm/config-default/config-lgsm/arkserver/_default.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg
index e57c873d1..8c3ab71db 100644
--- a/lgsm/config-default/config-lgsm/arkserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/arkserver/_default.cfg
@@ -13,13 +13,13 @@ ip="0.0.0.0"
 port="7777"
 queryport="27015"
 rconport="27020"
+# Default Map: TheIsland, Ragnarok, CrystalIsles, Aberration_P, ScorchedEarth_P
 defaultmap="TheIsland"
 maxplayers="70"
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="\"${defaultmap}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port}?\""
-}
+parms="\"${defaultmap}?AltSaveDirectoryName=${defaultmap}?listen?MultiHome=${ip}?MaxPlayers=${maxplayers}?QueryPort=${queryport}?RCONPort=${rconport}?Port=${port} -automanagedmods\""
 
 #### LinuxGSM Settings ####
 

From 1127c0b202f784f83af848a9f0ada69b1d8bb768 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 12:53:54 +0000
Subject: [PATCH 19/29] Fixed extip variable

---
 lgsm/functions/info_distro.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 36f06c4bf..d9b6bcef6 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -206,10 +206,14 @@ fi
 
 # External IP address
 if [ -z "${extip}" ]; then
-	extip=$(${curlpath} -m 3 ifconfig.co > "${tmpdir}/extip.txt" 2>/dev/null)
-	if [ $? -ne 0 ]; then
+	extip=$(${curlpath} -4 -m 3 ifconfig.co 2>/dev/null)
+	exitcode=$?
+	# Should ifconfig.co return an error will use last known IP
+	if [ ${exitcode} -eq 0 ]; then
+		echo "${extip}" > "${tmpdir}/extip.txt"
+	else
 		if [ -f "${tmpdir}/extip.txt" ]; then
-			echo "${tmpdir}/extip.txt"
+			extip=$(cat ${tmpdir}/extip.txt)
 		else
 			echo "x.x.x.x"
 		fi

From 17c8bbe02171e4a98be0dabf0e59f9ee0d6eaece Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 13:18:54 +0000
Subject: [PATCH 20/29] fixed cod query issue #2028

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

diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh
index 696ba8396..2345f5864 100644
--- a/lgsm/functions/info_parms.sh
+++ b/lgsm/functions/info_parms.sh
@@ -31,6 +31,7 @@ fn_info_parms_cod(){
 	defaultmap=${defaultmap:-"NOT SET"}
 	maxplayers=${maxplayers:-"0"}
 	port=${port:-"0"}
+	queryport=${port:-"0"}
 }
 
 fn_info_parms_dst(){

From bf31ed493a350e3d7d154cfe2a5035cf3fb65bf5 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 13:30:36 +0000
Subject: [PATCH 21/29] gametracker.com will always use extip if available

---
 lgsm/functions/alert_pushover.sh | 2 +-
 lgsm/functions/alert_telegram.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh
index 9d09d1e90..d25e598c6 100644
--- a/lgsm/functions/alert_pushover.sh
+++ b/lgsm/functions/alert_pushover.sh
@@ -24,7 +24,7 @@ else
 	alertpriority="0"
 fi
 
-pushoversend=$(${curlpath} -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${ip}:${port}'>${ip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
+pushoversend=$(${curlpath} -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${extip:-$ip}:${port}'>${extip:-$ip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
 
 if [ -n "${pushoversend}" ]; then
 	fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"
diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh
index cf14aafc3..647ea7008 100644
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@@ -12,7 +12,7 @@ json=$(cat <<EOF
 {
 	"chat_id": "${telegramchatid}",
 	"parse_mode": "HTML",
-	"text": "${alertemoji} <b>${alertsubject}</b> ${alertemoji}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${ip}:${port}'>${ip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+	"text": "${alertemoji} <b>${alertsubject}</b> ${alertemoji}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${extip:-$ip}:${port}'>${extip:-$ip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
 	"disable_web_page_preview": "yes",
 EOF
 )

From 9ee6bdb6660a3b3335e5b18cc587740c4e95b3f2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 13:57:15 +0000
Subject: [PATCH 22/29] SC2086

---
 lgsm/functions/alert_mailgun.sh        | 2 +-
 lgsm/functions/check_status.sh         | 2 +-
 lgsm/functions/install_server_files.sh | 2 +-
 lgsm/functions/update_steamcmd.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lgsm/functions/alert_mailgun.sh b/lgsm/functions/alert_mailgun.sh
index ac46e03d7..d42aaddab 100644
--- a/lgsm/functions/alert_mailgun.sh
+++ b/lgsm/functions/alert_mailgun.sh
@@ -17,7 +17,7 @@ mailgunsend=$(${curlpath} -s --user "api:${mailguntoken}" \
 -F subject="${alertemoji} ${alertsubject} ${alertemoji}" \
 -F o:tag='alert' \
 -F o:tag='LinuxGSM' \
--F text="$(cat "${alertlog}")" https://api.mailgun.net/v3/${mailgundomain}/messages)
+-F text="$(cat "${alertlog}")" "https://api.mailgun.net/v3/${mailgundomain}/messages")
 
 if [ -z "${mailgunsend}" ]; then
 	fn_print_fail_nl "Sending Email alert: Mailgun: ${email}"
diff --git a/lgsm/functions/check_status.sh b/lgsm/functions/check_status.sh
index 61d1d030d..529dcbf5b 100644
--- a/lgsm/functions/check_status.sh
+++ b/lgsm/functions/check_status.sh
@@ -12,7 +12,7 @@ if [ "${shortname}" == "ts3" ]; then
 	# 1: Server is running
 	# 0: Server seems to have died
 	# 0: No server running (ts3server.pid is missing)
-	status=$("${executabledir}/ts3server_startscript.sh" status servercfgfullpathfile=${servercfgfullpath})
+	status=$("${executabledir}/ts3server_startscript.sh" status servercfgfullpathfile="${servercfgfullpath}")
 	if [ "${status}" == "Server is running" ]; then
 		status=1
 	else
diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh
index a67045747..e3930843b 100644
--- a/lgsm/functions/install_server_files.sh
+++ b/lgsm/functions/install_server_files.sh
@@ -72,7 +72,7 @@ fn_install_server_files_steamcmd(){
 			fi
 
 			if [ "${counter}" -ge "7" ]; then
-				echo "Removing $(find ${serverfiles} -type d -print0 | grep -Ez '[^/]{30}$')"
+				echo "Removing $(find "${serverfiles}" -type d -print0 | grep -Ez '[^/]{30}$')"
 				find "${serverfiles}" -type d -print0 | grep -Ez '[^/]{30}$' | xargs -0 rm -rf
 			fi
 			if [ "${counter}" -ge "9" ]; then
diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh
index 15fb0277f..480624f7b 100644
--- a/lgsm/functions/update_steamcmd.sh
+++ b/lgsm/functions/update_steamcmd.sh
@@ -157,7 +157,7 @@ fn_update_steamcmd_check(){
 	fi
 
 	# Set branch for updateinfo
-	IFS=' ' read -ra branchsplits <<< ${branch}
+	IFS=' ' read -ra branchsplits <<< "${branch}"
 	if [ "${#branchsplits[@]}" -gt 1 ]; then
 		branchname="${branchsplits[1]}"
 	else

From 67094a76888c906ff1395659513f97e1fb751252 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 19:21:48 +0000
Subject: [PATCH 23/29] Added donate feature

---
 lgsm/functions/command_donate.sh | 18 ++++++++++++++++++
 lgsm/functions/core_functions.sh | 14 ++++++++++----
 lgsm/functions/core_getopt.sh    |  2 ++
 lgsm/functions/install_header.sh |  8 ++++----
 4 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 lgsm/functions/command_donate.sh

diff --git a/lgsm/functions/command_donate.sh b/lgsm/functions/command_donate.sh
new file mode 100644
index 000000000..78bfc48b7
--- /dev/null
+++ b/lgsm/functions/command_donate.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# LinuxGSM command_donate.sh function
+# Author: Daniel Gibbs
+# Website: https://linuxgsm.com
+# Description: Shows ways to donate
+
+echo "Support LinuxGSM"
+echo "================================="
+echo ""
+echo "Been using LinuxGSM?"
+echo "Consider donating to support development."
+echo ""
+echo "* Patreon: https://linuxgsm.com/patreon"
+echo "* PayPal: https://linuxgsm.com/paypal"
+echo "* Flattr: https://linuxgsm.com/flattr"
+echo "* Buy me a Coffee: https://linuxgsm.com/coffee"
+echo ""
+echo "LinuxGSM has been going since 2012"
\ No newline at end of file
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index f4b27fdd1..416835504 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -51,6 +51,12 @@ fn_fetch_function
 
 # Commands
 
+
+command_backup.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 command_console.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
@@ -61,22 +67,22 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_postdetails.sh(){
+command_details.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_details.sh(){
+command_donate.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_test_alert.sh(){
+command_postdetails.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_backup.sh(){
+command_test_alert.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 07b5e71f9..44cb64b5e 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -50,6 +50,8 @@ cmd_dev_detect_glibc=( "dg;detect-glibc" "command_dev_detect_glibc.sh" "Detect r
 cmd_dev_detect_ldd=( "dl;detect-ldd" "command_dev_detect_ldd.sh" "Detect required dynamic dependencies." )
 cmd_dev_query_raw=( "qr;query-raw" "command_dev_query_raw.sh" "The raw output of gamedig and gsquery." )
 cmd_dev_clear_functions=( "cf;clear-functions" "command_dev_clear_functions.sh" "Delete the contents of the functions dir." )
+# Donate
+cmd_donate=( "do;donate" "command_donate.sh" "Donation options." )
 
 ### Set specific opt here ###
 
diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh
index cae416547..40c2845fc 100644
--- a/lgsm/functions/install_header.sh
+++ b/lgsm/functions/install_header.sh
@@ -10,9 +10,9 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 clear
 echo "================================="
-echo "${gamename}"
-echo "Linux Game Server Manager"
+echo "LinuxGSM - ${gamename}"
 echo "by Daniel Gibbs"
-echo "Contributors: http://goo.gl/qLmitD"
-echo "https://linuxgsm.com"
+echo "Website: https://linuxgsm.com"
+echo "Contributors: https://linuxgsm.com/contrib"
+echo "Donate: https://linuxgsm.com/donate"
 echo "================================="

From 132a9865904373654f9e0c73ef9b9dd1807c8872 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 19:25:37 +0000
Subject: [PATCH 24/29] minor visual adjustment

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

diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 44cb64b5e..4766fabe9 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -20,6 +20,7 @@ cmd_backup=( "b;backup" "command_backup.sh" "Create backup archives of the serve
 cmd_update_linuxgsm=( "ul;update-lgsm;uf;update-functions" "command_update_linuxgsm.sh" "Check and apply any LinuxGSM updates." )
 cmd_test_alert=( "ta;test-alert" "command_test_alert.sh" "Send a test alert." )
 cmd_monitor=( "m;monitor" "command_monitor.sh" "Check server status and restart if crashed." )
+cmd_donate=( "do;donate" "command_donate.sh" "Donation options." )
 # Console servers only
 cmd_console=( "c;console" "command_console.sh" "Access server console." )
 cmd_debug=( "d;debug" "command_debug.sh" "Start server directly in your terminal." )
@@ -50,8 +51,7 @@ cmd_dev_detect_glibc=( "dg;detect-glibc" "command_dev_detect_glibc.sh" "Detect r
 cmd_dev_detect_ldd=( "dl;detect-ldd" "command_dev_detect_ldd.sh" "Detect required dynamic dependencies." )
 cmd_dev_query_raw=( "qr;query-raw" "command_dev_query_raw.sh" "The raw output of gamedig and gsquery." )
 cmd_dev_clear_functions=( "cf;clear-functions" "command_dev_clear_functions.sh" "Delete the contents of the functions dir." )
-# Donate
-cmd_donate=( "do;donate" "command_donate.sh" "Donation options." )
+
 
 ### Set specific opt here ###
 
@@ -138,6 +138,9 @@ if [ -f ".dev-debug" ]; then
 	currentopt+=( "${cmd_dev_detect_deps[@]}" "${cmd_dev_detect_glibc[@]}" "${cmd_dev_detect_ldd[@]}" "${cmd_dev_query_raw[@]}" "${cmd_dev_clear_functions[@]}" )
 fi
 
+## Donate
+currentopt+=( "${cmd_donate[@]}" )
+
 ### Build list of available commands
 optcommands=()
 index="0"
@@ -152,7 +155,7 @@ done
 fn_opt_usage(){
 	echo "Usage: $0 [option]"
 	echo -e ""
-	echo "${gamename} - Linux Game Server Manager - Version ${version}"
+	echo "LinuxGSM - ${gamename} - Version ${version}"
 	echo "https://linuxgsm.com/${gameservername}"
 	echo -e ""
 	echo -e "${lightyellow}Commands${default}"

From 26b726d60f513e2fb346e57ca5c5775027fdd901 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 19:56:17 +0000
Subject: [PATCH 25/29] Visual updates

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

diff --git a/lgsm/functions/command_donate.sh b/lgsm/functions/command_donate.sh
index 78bfc48b7..cc9391e3d 100644
--- a/lgsm/functions/command_donate.sh
+++ b/lgsm/functions/command_donate.sh
@@ -4,15 +4,15 @@
 # Website: https://linuxgsm.com
 # Description: Shows ways to donate
 
+echo ""
 echo "Support LinuxGSM"
 echo "================================="
 echo ""
 echo "Been using LinuxGSM?"
 echo "Consider donating to support development."
 echo ""
-echo "* Patreon: https://linuxgsm.com/patreon"
-echo "* PayPal: https://linuxgsm.com/paypal"
-echo "* Flattr: https://linuxgsm.com/flattr"
-echo "* Buy me a Coffee: https://linuxgsm.com/coffee"
+echo "* ${blue}Patreon:${default} https://linuxgsm.com/patreon"
+echo "* ${blue}PayPal:${default} https://linuxgsm.com/paypal"
+echo "* ${blue}Flattr:${default} https://linuxgsm.com/flattr"
 echo ""
 echo "LinuxGSM has been going since 2012"
\ No newline at end of file

From efe9d581d53c3a611640b4f31caf117165729b6c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 19:56:55 +0000
Subject: [PATCH 26/29] more colours

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

diff --git a/lgsm/functions/command_donate.sh b/lgsm/functions/command_donate.sh
index cc9391e3d..245632a9b 100644
--- a/lgsm/functions/command_donate.sh
+++ b/lgsm/functions/command_donate.sh
@@ -5,7 +5,7 @@
 # Description: Shows ways to donate
 
 echo ""
-echo "Support LinuxGSM"
+echo "${lightyellow}Support LinuxGSM${default}"
 echo "================================="
 echo ""
 echo "Been using LinuxGSM?"

From 871d521e575d21f89cb093ad7938d6fb67e9e590 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 19:57:44 +0000
Subject: [PATCH 27/29] echo -e

---
 lgsm/functions/command_donate.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lgsm/functions/command_donate.sh b/lgsm/functions/command_donate.sh
index 245632a9b..a277b87b6 100644
--- a/lgsm/functions/command_donate.sh
+++ b/lgsm/functions/command_donate.sh
@@ -4,15 +4,15 @@
 # Website: https://linuxgsm.com
 # Description: Shows ways to donate
 
-echo ""
-echo "${lightyellow}Support LinuxGSM${default}"
-echo "================================="
-echo ""
-echo "Been using LinuxGSM?"
-echo "Consider donating to support development."
-echo ""
-echo "* ${blue}Patreon:${default} https://linuxgsm.com/patreon"
-echo "* ${blue}PayPal:${default} https://linuxgsm.com/paypal"
-echo "* ${blue}Flattr:${default} https://linuxgsm.com/flattr"
-echo ""
-echo "LinuxGSM has been going since 2012"
\ No newline at end of file
+echo -e ""
+echo -e "${lightyellow}Support LinuxGSM${default}"
+echo -e "================================="
+echo -e ""
+echo -e "Been using LinuxGSM?"
+echo -e "Consider donating to support development."
+echo -e ""
+echo -e "* ${blue}Patreon:${default} https://linuxgsm.com/patreon"
+echo -e "* ${blue}PayPal:${default} https://linuxgsm.com/paypal"
+echo -e "* ${blue}Flattr:${default} https://linuxgsm.com/flattr"
+echo -e ""
+echo -e "LinuxGSM has been going since 2012"
\ No newline at end of file

From 77bb111830ef823f5457de4b41d90a68a649b9d0 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 23 Nov 2018 20:00:39 +0000
Subject: [PATCH 28/29] Added donate option

---
 lgsm/functions/command_donate.sh | 18 ++++++++++++++++++
 lgsm/functions/core_functions.sh | 14 ++++++++++----
 lgsm/functions/core_getopt.sh    |  7 ++++++-
 lgsm/functions/install_header.sh |  8 ++++----
 4 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 lgsm/functions/command_donate.sh

diff --git a/lgsm/functions/command_donate.sh b/lgsm/functions/command_donate.sh
new file mode 100644
index 000000000..a277b87b6
--- /dev/null
+++ b/lgsm/functions/command_donate.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# LinuxGSM command_donate.sh function
+# Author: Daniel Gibbs
+# Website: https://linuxgsm.com
+# Description: Shows ways to donate
+
+echo -e ""
+echo -e "${lightyellow}Support LinuxGSM${default}"
+echo -e "================================="
+echo -e ""
+echo -e "Been using LinuxGSM?"
+echo -e "Consider donating to support development."
+echo -e ""
+echo -e "* ${blue}Patreon:${default} https://linuxgsm.com/patreon"
+echo -e "* ${blue}PayPal:${default} https://linuxgsm.com/paypal"
+echo -e "* ${blue}Flattr:${default} https://linuxgsm.com/flattr"
+echo -e ""
+echo -e "LinuxGSM has been going since 2012"
\ No newline at end of file
diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
index f4b27fdd1..416835504 100644
--- a/lgsm/functions/core_functions.sh
+++ b/lgsm/functions/core_functions.sh
@@ -51,6 +51,12 @@ fn_fetch_function
 
 # Commands
 
+
+command_backup.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 command_console.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
@@ -61,22 +67,22 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_postdetails.sh(){
+command_details.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_details.sh(){
+command_donate.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_test_alert.sh(){
+command_postdetails.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
 
-command_backup.sh(){
+command_test_alert.sh(){
 functionfile="${FUNCNAME}"
 fn_fetch_function
 }
diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 07b5e71f9..4766fabe9 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -20,6 +20,7 @@ cmd_backup=( "b;backup" "command_backup.sh" "Create backup archives of the serve
 cmd_update_linuxgsm=( "ul;update-lgsm;uf;update-functions" "command_update_linuxgsm.sh" "Check and apply any LinuxGSM updates." )
 cmd_test_alert=( "ta;test-alert" "command_test_alert.sh" "Send a test alert." )
 cmd_monitor=( "m;monitor" "command_monitor.sh" "Check server status and restart if crashed." )
+cmd_donate=( "do;donate" "command_donate.sh" "Donation options." )
 # Console servers only
 cmd_console=( "c;console" "command_console.sh" "Access server console." )
 cmd_debug=( "d;debug" "command_debug.sh" "Start server directly in your terminal." )
@@ -51,6 +52,7 @@ cmd_dev_detect_ldd=( "dl;detect-ldd" "command_dev_detect_ldd.sh" "Detect require
 cmd_dev_query_raw=( "qr;query-raw" "command_dev_query_raw.sh" "The raw output of gamedig and gsquery." )
 cmd_dev_clear_functions=( "cf;clear-functions" "command_dev_clear_functions.sh" "Delete the contents of the functions dir." )
 
+
 ### Set specific opt here ###
 
 currentopt=( "${cmd_start[@]}" "${cmd_stop[@]}" "${cmd_restart[@]}" "${cmd_monitor[@]}" "${cmd_test_alert[@]}" "${cmd_details[@]}" "${cmd_postdetails[@]}" )
@@ -136,6 +138,9 @@ if [ -f ".dev-debug" ]; then
 	currentopt+=( "${cmd_dev_detect_deps[@]}" "${cmd_dev_detect_glibc[@]}" "${cmd_dev_detect_ldd[@]}" "${cmd_dev_query_raw[@]}" "${cmd_dev_clear_functions[@]}" )
 fi
 
+## Donate
+currentopt+=( "${cmd_donate[@]}" )
+
 ### Build list of available commands
 optcommands=()
 index="0"
@@ -150,7 +155,7 @@ done
 fn_opt_usage(){
 	echo "Usage: $0 [option]"
 	echo -e ""
-	echo "${gamename} - Linux Game Server Manager - Version ${version}"
+	echo "LinuxGSM - ${gamename} - Version ${version}"
 	echo "https://linuxgsm.com/${gameservername}"
 	echo -e ""
 	echo -e "${lightyellow}Commands${default}"
diff --git a/lgsm/functions/install_header.sh b/lgsm/functions/install_header.sh
index cae416547..40c2845fc 100644
--- a/lgsm/functions/install_header.sh
+++ b/lgsm/functions/install_header.sh
@@ -10,9 +10,9 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 clear
 echo "================================="
-echo "${gamename}"
-echo "Linux Game Server Manager"
+echo "LinuxGSM - ${gamename}"
 echo "by Daniel Gibbs"
-echo "Contributors: http://goo.gl/qLmitD"
-echo "https://linuxgsm.com"
+echo "Website: https://linuxgsm.com"
+echo "Contributors: https://linuxgsm.com/contrib"
+echo "Donate: https://linuxgsm.com/donate"
 echo "================================="

From be2a9075e81008d4dc715a99222f20ad7b187d5e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 24 Nov 2018 00:47:58 +0000
Subject: [PATCH 29/29] new pro-bots

---
 .github/release-drafter.yml | 4 ++++
 .github/topissuebot.yml     | 4 ++++
 .github/write-good.yml      | 4 ++++
 3 files changed, 12 insertions(+)
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/topissuebot.yml
 create mode 100644 .github/write-good.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 000000000..1387c5e19
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,4 @@
+template: |
+  ## Changelog
+
+  $CHANGES
\ No newline at end of file
diff --git a/.github/topissuebot.yml b/.github/topissuebot.yml
new file mode 100644
index 000000000..b02540a2d
--- /dev/null
+++ b/.github/topissuebot.yml
@@ -0,0 +1,4 @@
+# Configuration for top-issue-bot
+labelName: ":thumbsup: Top Issue!"
+labelColor: "f442c2"
+numberOfIssuesToLabel: 5
\ No newline at end of file
diff --git a/.github/write-good.yml b/.github/write-good.yml
new file mode 100644
index 000000000..2bdb512ad
--- /dev/null
+++ b/.github/write-good.yml
@@ -0,0 +1,4 @@
+# .github/write-good.yml
+writeGood: true
+alex: true
+spellchecker: true
\ No newline at end of file