From ee9ed544cf51344c14ef2462256b03e42d2d6bc4 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 4 Jul 2023 13:27:38 +0200
Subject: [PATCH] modulecmd.bash.in: code for sub-cmd avail reviewed

---
 Pmodules/modulecmd.bash.in | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 4d089e3..4dc4f1d 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -1362,26 +1362,35 @@ subcommand_avail() {
 			name="${dir}"
 			group="${dir//[\/ .-]/_}"
 		fi
+		# With overlays we can have multiple directories per group!
+		#
+		# Create an ordered list of directories per group.
+		# Note:
+		# BASH doesn't support list as values of dictionaries. We use
+		# reference variables to work around this.
 		if [[ ! -v modulepath_${group} ]]; then
 			typeset -a modulepath_${group}
 		fi
-		# with overlays we can have multiple directories per group!
 		typeset -n path=modulepath_${group}
 		path+=("${dir}")
-		local -i found=0
+		# Create ordered list of groups. In the next step we
+		# loop over this list.
 		for group in "${groups[@]}"; do
 			if [[ "${group}" == ${name} ]]; then
-				found=1
+				# resume with next dir
+				continue 2
 			fi
 		done
-		(( found == 0 )) && groups+=( "${name}" )
+		groups+=( "${name}" )
         done
-        local p
+        local string
 	for string in  "${pattern[@]}"; do
                 for group in "${groups[@]}"; do
+			# limit output to certain groups
 			if (( ${#opt_groups[@]} > 0 )) && [[ ! -v opt_groups[${group}] ]]; then
 				continue
 			fi
+
 			local ref="${group//[\/ .-]/_}"
 			[[ -v modulepath_${ref} ]] || continue
 			typeset -n path=modulepath_${ref}