From 693c38b3b0c3147d09b3ded14e2c02a67a5602ef Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 17 Nov 2023 15:47:02 +0100
Subject: [PATCH] modulecmd: check availability of a module reviewed

Entries in the system- and blocklist can now use glob pattern.
The blocklist is now checked before the system list.
---
 Pmodules/modulecmd.bash.in | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 8593f52..0866db6 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -352,17 +352,39 @@ is_available(){
 	- the blocklist is empty or the hostname is NOT in the list
 	"
 	local -n ref_cfg="$1"
-	local -- rel_stages="$2"
+	local -- relstages="$2"
 	local -- system="$3"
 	local -- hostname="$4"
 
-	[[ ":${rel_stages}:" =~ ":${ref_cfg['rel_stage']}:" ]] || return 1
-	if [[ "${ref_cfg['systems']}" != "" ]]; then
-		[[ "${ref_cfg['systems']//$'\n'/:}:" =~ "${system}" ]] || return 1
-	fi
-	if [[ "${ref_cfg['blocklist']}" != "" ]]; then
-		[[ "${ref_cfg['blocklist']//$'\n'/:}:" =~ "${hostname}" ]] && return 1
-	fi
+	check_relstage(){
+		[[ ":${relstages}:" =~ ":${ref_cfg['relstage']}:" ]]
+	}
+	check_blocklist(){
+		[[ -z ${ref_cfg['blocklist']} ]] && return 0
+		local -- s=''
+		for s in ${ref_cfg['blocklist']}; do
+			if [[ "${system}" == $s ]] || [[ "${HOSTNAME}" == $s ]]; then
+				return 0
+			fi
+		done
+		return 1
+	}
+	check_systems(){
+		[[ -z ${ref_cfg['systems']} ]] && return 0
+		local -- s=''
+		for s in ${ref_cfg['systems']}; do
+			if [[ "${system}" == $s ]] || [[ "${HOSTNAME}" == $s ]]; then
+				return 0
+			fi
+		done
+		return 1
+	}
+	set -o noglob
+	check_relstage && check_blocklist && check_systems
+	local -i ec=$?
+	set +o noglob
+	return ${ec}
+
 }
 
 #