Merge branch 'release/v23.6.0'

.github/workflows/details-check.yml

@@ -59,14 +59,14 @@ jobs:
 
       - name: Download config
         run: |
-          if [ -z "${{ steps.sets-servercfgname.outputs.servercfgname }}" ]; then
+          if [ "${{ steps.sets-servercfgname.outputs.servercfgname }}" == "" ]; then
             echo "This game server has no config file."
           else
             curl -f -o config "https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/main/${{ matrix.shortname }}/${{ steps.sets-servercfgname.outputs.servercfgname }}"
           fi
       - name: Display config
         run: |
-          if [ -z "${{ steps.sets-servercfgname.outputs.servercfgname }}" ]; then
+          if [ "${{ steps.sets-servercfgname.outputs.servercfgname }}" == "" ]; then
             echo "This game server has no config file."
           else
             cat config

.github/workflows/detals-check-generate-matrix.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
+curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
 
 echo -n "{" > "shortnamearray.json"
 echo -n "\"include\":[" >> "shortnamearray.json"

.github/workflows/serverlist-validate-game-icons.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+cd "lgsm/data" || exit
+
+echo ""
+echo "Checking that all the game servers listed in serverlist.csv have a shortname-icon.png file"
+for shortname in $(tail -n +2 serverlist.csv | cut -d ',' -f1); do
+	# check if $shortname-icon.png exists
+	if [ ! -f "gameicons/${shortname}-icon.png" ]; then
+		echo "ERROR: gameicons/${shortname}-icon.png does not exist"
+		exitcode=1
+	else
+		echo "OK: gameicons/${shortname}-icon.png exists"
+	fi
+done
+
+echo ""
+echo "Checking if an unexpected gameicon exists"
+for gameicon in $(ls -1 gameicons); do
+	# check if $gameicon is in serverlist.csv
+	if ! grep -q "${gameicon%-icon.png}" serverlist.csv; then
+		echo "ERROR: gameicon ${gameicon} is not in serverlist.csv"
+		exitcode=1
+	else
+		echo "OK: gameicon ${gameicon} is in serverlist.csv"
+	fi
+done
+
+echo ""
+echo "Checking that the number of gameicons matches the number of servers in serverlist.csv"
+gameiconcount="$(ls -1 gameicons | wc -l)"
+serverlistcount="$(tail -n +2 serverlist.csv | wc -l)"
+if [ "${gameiconcount}" -ne "${serverlistcount}" ]; then
+	echo "ERROR: game icons (${gameiconcount}) does not match serverlist.csv ($serverlistcount)"
+	exitcode=1
+else
+	echo "OK: gameiconcount ($gameiconcount) matches serverlistcount ($serverlistcount)"
+fi
+
+exit ${exitcode}

.github/workflows/serverlist-validate.sh

@@ -10,7 +10,7 @@ csvlist="$(ls -1 | grep -E '^(ubuntu|debian|centos|rhel|almalinux|rocky).*\.csv$
 # loop though each csv file and make sure the number of lines is the same as the serverlistcount
 for csv in $csvlist; do
 	csvcount="$(wc -l < "${csv}")"
-	csvcount=$((csvcount-2))
+	csvcount=$((csvcount - 2))
 	if [ "$csvcount" -ne "$serverlistcount" ]; then
 		echo "ERROR: $csv ($csvcount) does not match serverlist.csv ($serverlistcount)"
 		exitcode=1
@@ -19,4 +19,20 @@ for csv in $csvlist; do
 	fi
 done
 
+# Compare all game servers listed in serverlist.csv to $shortname-icon.png files in lgsm/data/gameicons
+# if the game server is listed in serverlist.csv then it will have a $shortname-icon.png file
+
+# loop though shortname in serverlist.csv
+echo ""
+echo "Checking that all the game servers listed in serverlist.csv have a shortname-icon.png file"
+for shortname in $(tail -n +2 serverlist.csv | cut -d ',' -f1); do
+	# check if $shortname-icon.png exists
+	if [ ! -f "gameicons/${shortname}-icon.png" ]; then
+		echo "ERROR: gameicons/${shortname}-icon.png does not exist"
+		exitcode=1
+	else
+		echo "OK: gameicons/${shortname}-icon.png exists"
+	fi
+done
+
 exit ${exitcode}

.github/workflows/serverlist-validate.yml

@@ -12,3 +12,6 @@ jobs:
 
       - name: Compare Versions
         run: chmod +x .github/workflows/serverlist-validate.sh; .github/workflows/serverlist-validate.sh
+
+      - name: Validate Game Icons
+        run: chmod +x .github/workflows/serverlist-validate-game-icons.sh; .github/workflows/serverlist-validate-game-icons.sh

.prettierrc

@@ -1,3 +1,3 @@
 {
-  "plugins": ["prettier-plugin-sh"]
+	"plugins": ["prettier-plugin-sh"]
 }

lgsm/config-default/config-lgsm/acserver/_default.cfg

@@ -32,6 +32,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -51,14 +54,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -72,7 +67,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/ahl2server/_default.cfg

@@ -40,6 +40,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -59,14 +62,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -80,7 +75,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/ahlserver/_default.cfg

@@ -35,6 +35,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -54,14 +57,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -75,7 +70,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/arkserver/_default.cfg

@@ -38,6 +38,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -57,14 +60,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -78,7 +73,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/arma3server/_default.cfg

@@ -51,6 +51,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -70,14 +73,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -91,7 +86,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/armarserver/_default.cfg

@@ -36,6 +36,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -55,14 +58,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -76,7 +71,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/atsserver/_default.cfg

@@ -28,6 +28,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -47,14 +50,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -68,7 +63,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"

lgsm/config-default/config-lgsm/avserver/_default.cfg

@@ -28,6 +28,9 @@ displayip=""
 # More info | https://docs.linuxgsm.com/alerts#more-info
 postalert="off"
 
+# Alert on Start/Stop/Restart
+statusalert="off"
+
 # Discord Alerts | https://docs.linuxgsm.com/alerts/discord
 discordalert="off"
 discordwebhook="webhook"
@@ -47,14 +50,6 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
-# Mailgun Email Alerts | https://docs.linuxgsm.com/alerts/mailgun
-mailgunalert="off"
-mailgunapiregion="us"
-mailguntoken="accesstoken"
-mailgundomain="example.com"
-mailgunemailfrom="[email protected]"
-mailgunemail="[email protected]"
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"
@@ -68,7 +63,6 @@ pushoveruserkey="userkey"
 # Rocket.Chat Alerts | https://docs.linuxgsm.com/alerts/rocket.chat
 rocketchatalert="off"
 rocketchatwebhook="webhook"
-rocketchattoken=""
 
 # Slack Alerts | https://docs.linuxgsm.com/alerts/slack
 slackalert="off"