pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-28 10:29:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

modulecmd: simplify code in removing replacing overlays

Browse Source
This commit is contained in:
gsell
2021-12-09 18:04:51 +01:00
parent 8237e61ab2
commit 62e7cd2e0a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modulecmd.bash.in
+5 -7
View File
@@ -1664,19 +1664,17 @@ subcommand_unuse() {
"overlay cannot be removed since" \
"it not on top of the stack" \
"${ol_name_or_dir%:*}"
if [[ "${OverlayDict[${ol_dir}]}" == "${ol_replacing}" ]]; then
# if this overlay hides groups, we have to re-add
# the modules made available by other overlays
for group in ${UsedGroups//:/ }; do
# first test whether this group is in the to be added overlay
local dir="${ol_dir}/"
dir+="${group}/${PMODULES_MODULEFILES_DIR}"
# is this group in the to be removed overlay?
local dir="${ol_dir}/${group}/${PMODULES_MODULEFILES_DIR}"
[[ -d "${dir}" ]] || continue # no
for dir in "${OverlayList[@]}"; do
dir+="/${group}/${PMODULES_MODULEFILES_DIR}"
std::remove_path MODULEPATH "${dir}"
done
dir="/${group}/${PMODULES_MODULEFILES_DIR}"
std::prepend_path MODULEPATH "${OverlayList[@]/%/${dir}}"
done
fi