From d639c08bb337099419eafc3d0af605568c41cb0d Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 21 Aug 2024 11:06:40 +0200
Subject: [PATCH] modulecmd: bugfix in un-using a group

---
 Pmodules/modulecmd.bash.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 9edf731..1b443e8 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -1962,7 +1962,7 @@ subcommand_unuse() {
 				done
 			done
 
-			# remove additional directories added overlay
+			# remove additional directories added by overlay
 			if [[ -v OverlayInfo[${ol_name}:modulepath] && \
 				      -n "${OverlayInfo[${ol_name}:modulepath]}" ]]; then
 				local -a modulepath=()
@@ -1980,6 +1980,7 @@ subcommand_unuse() {
                         for dir in "${modulepath[@]}"; do
                                 [[ "${dir}" == "${OverlayInfo[${ol_name}:modulefiles_root]}" ]] && \
                                         std::remove_path MODULEPATH "${dir}"
+
                         done
                         export_env UsedOverlays
                         EnvMustBeSaved='yes'
@@ -2007,7 +2008,8 @@ subcommand_unuse() {
                         std::remove_path UsedGroups "${arg}"
                         local overlay
                         for overlay in "${UsedOverlays[@]}"; do
-                                local dir="${overlay}/${arg}/${PMODULES_MODULEFILES_DIR}"
+				local dir="${OverlayInfo[${overlay}:modulefiles_root]}"
+				dir+="/${arg}/${PMODULES_MODULEFILES_DIR}"
 			        std::remove_path MODULEPATH "${dir}"
                         done
 		}