Merge branch 'release/v26.1.0' into develop

Author: unknown

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

@@ -22,7 +22,7 @@ shopt -s nullglob
 for gameiconpath in gameicons/*; do
 	gameicon="$(basename "${gameiconpath}")"
 	# check if $gameicon is in serverlist.csv
-	if ! grep -q -F "${gameicon%-icon.png}" serverlist.csv; then
+	if ! grep -q -E "^${gameicon%-icon.png}," serverlist.csv; then
 		echo "ERROR: gameicon ${gameicon} is not in serverlist.csv"
 		exitcode=1
 	else

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

@@ -72,16 +72,6 @@ ntfypassword=""
 ntfypriority=""
 ntfytags=""
 
-# ntfy Alerts | https://docs.linuxgsm.com/alerts/ntfy
-ntfyalert="off"
-ntfytopic="LinuxGSM"
-ntfyserver="https://ntfy.sh"
-ntfytoken=""
-ntfyusername=""
-ntfypassword=""
-ntfypriority=""
-ntfytags=""
-
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"

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

@@ -65,6 +65,16 @@ iftttalert="off"
 ifttttoken="accesstoken"
 iftttevent="linuxgsm_alert"
 
+# ntfy Alerts | https://docs.linuxgsm.com/alerts/ntfy
+ntfyalert="off"
+ntfytopic="LinuxGSM"
+ntfyserver="https://ntfy.sh"
+ntfytoken=""
+ntfyusername=""
+ntfypassword=""
+ntfypriority=""
+ntfytags=""
+
 # Pushbullet Alerts | https://docs.linuxgsm.com/alerts/pushbullet
 pushbulletalert="off"
 pushbullettoken="accesstoken"

lgsm/modules/alert_slack.sh

@@ -60,6 +60,7 @@ json=$(
 						"image_url": "${alerticon}",
 						"alt_text": "LinuxGSM game icon"
 					}
+				}
 EOF
 )
 

lgsm/modules/command_skeleton.sh

@@ -3,7 +3,7 @@
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com
-# Description: Creates an copy of a game servers directories.
+# Description: Creates a copy of a game server directories.
 
 commandname="SKELETON"
 commandaction="Skeleton"

lgsm/modules/core_dl.sh

@@ -46,9 +46,9 @@ fn_dl_steamcmd() {
 		validate="validate"
 	fi
 
-	# steamcmdcommand can contain multiple arguments; treat it as an argv array.
-	steamcmdcommandarray=()
-	read -r -a steamcmdcommandarray <<< "${steamcmdcommand}"
+	# Wrap steamcmdcommand as a single-element array to avoid word-splitting
+	# on paths/commands that should not be tokenised.
+	steamcmdcommandarray=("${steamcmdcommand}")
 	unbuffercommand=()
 	if [ -n "${unbuffer}" ]; then
 		unbuffercommand=("${unbuffer}")

lgsm/modules/core_modules.sh

@@ -8,7 +8,7 @@
 
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v25.2.0"
+modulesversion="v26.1.0"
 
 # Core
 

lgsm/modules/fix_st.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LinuxGSM fix_ts.sh module
+# LinuxGSM fix_st.sh module
 # Author: Daniel Gibbs
 # Contributors: https://linuxgsm.com/contrib
 # Website: https://linuxgsm.com

linuxgsm.sh

@@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v25.2.0"
+version="v26.1.0"
 shortname="core"
 gameservername="core"
 commandname="CORE"