From d04d5b6dfdcc34d844fc92b5bc1ab9c3b4f1de46 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 19 Apr 2026 20:16:40 +0000
Subject: [PATCH] fix: address review feedback

- core_dl.sh: use array assignment for steamcmdcommand instead of
  read -r -a to avoid word-splitting on paths
- fix_st.sh: correct module header typo (fix_ts.sh -> fix_st.sh)
- command_skeleton.sh: fix grammar 'Creates an copy' -> 'Creates a copy'
- serverlist-validate-game-icons.sh: anchor grep to start-of-line and
  require trailing comma to prevent false positives (e.g. 'tf' matching
  'tf2' entries)
- cs2server/_default.cfg: remove duplicate ntfy alert settings block
---
 .github/workflows/serverlist-validate-game-icons.sh    |  2 +-
 lgsm/config-default/config-lgsm/cs2server/_default.cfg | 10 ----------
 lgsm/modules/command_skeleton.sh                       |  2 +-
 lgsm/modules/core_dl.sh                                |  6 +++---
 lgsm/modules/fix_st.sh                                 |  2 +-
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/serverlist-validate-game-icons.sh b/.github/workflows/serverlist-validate-game-icons.sh
index b3ba7e418..8d35aa906 100755
--- a/.github/workflows/serverlist-validate-game-icons.sh
+++ b/.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
diff --git a/lgsm/config-default/config-lgsm/cs2server/_default.cfg b/lgsm/config-default/config-lgsm/cs2server/_default.cfg
index 56948c77f..8d65b5364 100644
--- a/lgsm/config-default/config-lgsm/cs2server/_default.cfg
+++ b/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"
diff --git a/lgsm/modules/command_skeleton.sh b/lgsm/modules/command_skeleton.sh
index 687790a37..3e07edc3a 100755
--- a/lgsm/modules/command_skeleton.sh
+++ b/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"
diff --git a/lgsm/modules/core_dl.sh b/lgsm/modules/core_dl.sh
index dcbd88e9b..4730c0cff 100755
--- a/lgsm/modules/core_dl.sh
+++ b/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}")
diff --git a/lgsm/modules/fix_st.sh b/lgsm/modules/fix_st.sh
index 598d971b0..887ea987f 100755
--- a/lgsm/modules/fix_st.sh
+++ b/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