From 76112ae2c38482db3ea00c655b8317f0497641d6 Mon Sep 17 00:00:00 2001
From: gsell <achim.gsell@psi.ch>
Date: Mon, 9 Sep 2024 10:34:10 +0200
Subject: [PATCH] Merge branch '353-modulecmd-regex-for-overlay-excludes' into
 'master'

Resolve "modulecmd: regex for overlay excludes"

Closes #353

See merge request Pmodules/src!353

(cherry picked from commit 9f6945d300dd9309799d6afdb3ab5944d0fdc016)

94661065 modulecmd: regex can now be used in overlay excludes

Co-authored-by: gsell <achim.gsell@psi.ch>
---
 Pmodules/modulecmd.bash.in | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 765efcb..03d7788 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -51,7 +51,7 @@ declare -- ReleaseStages=':unstable:stable:deprecated:'
 # set releases which should be available after initialization
 declare -- DefaultReleaseStages='stable'
 
-declare -A OverlayExcludes=()
+declare -- OverlayExcludes=''
 declare -a UsedOverlays=()
 declare -- PmFiles=''
 declare -- ModulePathAppend=''
@@ -1214,8 +1214,8 @@ get_available_modules() {
 		# its sub-directories
 		local mod=''	# module_name/module_version
                 while read -r mod; do
+			[[ "${mod}" =~ ${OverlayExcludes} ]] && continue
 			local name="${mod%/*}"
-			[[ -v OverlayExcludes[${name}] ]] && continue
 			local add='no'
 			if [[ -n "${ol}" && "${ol}" != 'none' ]]; then
 				# module is in an overlay
@@ -1794,13 +1794,15 @@ subcommand_use() {
                         UsedOverlays=( "${ol_name}" "${UsedOverlays[@]}" )
 			OverlayInfo[${ol_name}:used]='yes'
 
-			local excludes=()
-			local item
+			local -a excludes=()
 			IFS=':' read -r -a excludes <<< "${OverlayInfo[${ol_name}:excludes]}"
+			local -- item=''
 			for item in "${excludes[@]}"; do
-				OverlayExcludes[${item}]=1
+				OverlayExcludes+="${item}|"
 			done
-
+			if [[ -n "${OverlayExcludes}" ]]; then
+				OverlayExcludes="${OverlayExcludes:0: -1}"
+			fi
 	                scan_groups "${UsedOverlays[@]}"
                 }
 
@@ -1967,17 +1969,19 @@ subcommand_unuse() {
 			# Note:
 			# A module might be excluded in multiple overlays. So, we cannot
 			# just remove the excludes from the overlay to unuse.
-			local excludes=()
-			OverlayExcludes=()
-			local ol
-			local item
+			OverlayExcludes=''
+			local -- ol=''
+			local -a excludes=()
+			local -- item=''
 			for ol in "${UsedOverlays[@]}"; do
 				IFS=':' read -r -a excludes <<< "${OverlayInfo[${ol}:excludes]}"
 				for item in "${excludes[@]}"; do
-					OverlayExcludes[${item}]=1
+					OverlayExcludes+="${item}|"
 				done
 			done
-
+			if [[ -n "${OverlayExcludes}" ]]; then
+				OverlayExcludes="${OverlayExcludes:0: -1}"
+			fi
 			# remove additional directories added by overlay
 			if [[ -v OverlayInfo[${ol_name}:modulepath] && \
 				      -n "${OverlayInfo[${ol_name}:modulepath]}" ]]; then
@@ -2169,6 +2173,7 @@ pmodules_init() {
 	init_overlay_vars() {
 		declare -ag UsedOverlays=( 'base' )
 		OverlayInfo['base:used']='yes'
+		declare -g OverlayExcludes=''
 	}
 
 	init_manpath() {