From 7acd70d2df3dcf4fa52594a6f34f2a528fb80c1a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 7 Dec 2021 17:38:20 +0100
Subject: [PATCH] modbuild: bugfixes in get_overlay_name_and_dir()

---
 Pmodules/modbuild.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index 95a9e40..9764237 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -423,21 +423,21 @@ get_overlay_name_and_dir() {
 	if [[ -v PMODULES_OVERLAY_CONF ]]; then
 		config_files+=("${PMODULES_OVERLAY_CONF}")
 	fi
-	config_files+=("${HOME}/.Pmodules/overlay.conf")
+	config_files+=("${HOME}/.Pmodules/overlays.conf")
 	config_files+=("${OVERLAY_CONF}")
 	for config_file in "${config_files[@]}"; do
-		[[ -r "${OVERLAY_CONF}" ]] || continue
+		[[ -r "${config_file}" ]] || continue
 		local toks=()
 		while read -a toks; do
 			[[ -n "${toks[0]}" ]] || continue
-			[[ ! "${toks[0]}" =~ \#* ]] || continue
+			[[ ${toks[0]} == \#* ]] && continue
 			if [[ ${toks[0]} == $3 ]] || [[ ${toks[1]} == $3 ]]; then
 				std::upvar $1  "${toks[0]}"
 				std::upvar $2  "${toks[1]}"
 				return 0
 			fi
 		done < "${config_file}"
-	fi
+	done
 	return 1
 }