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

Merge branch '407-moduelcmd-argument-not-used-in-use_group-and-unuse_group' into 'master'

Browse Source 
Resolve "moduelcmd: argument not used in use_group() and unuse_group()"

Closes #407

See merge request Pmodules/src!439
This commit is contained in:
gsell
2025-03-14 17:31:28 +01:00
parent 135f3fbff7 f9aa82ca0a
commit 1d6143dcb2
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modulecmd.bash.in
+13 -11
View File
@@ -1943,17 +1943,18 @@ subcommand_use() {
#..............................................................
use_group() {
local -- grp="$1"
# die if argument is a hierarchical group
(( ${GroupDepths[${arg}]} > 0 )) && \
die_grp_invalid "${arg}"
(( ${GroupDepths[${grp}]} > 0 )) && \
die_grp_invalid "${grp}"
std::append_path UsedGroups "$1"
std::append_path UsedGroups "${grp}"
local -- ol_name
local -i i=0
local -i n="${#UsedOverlays[@]}"
for ((i=n-1; i>=0; i--)); do
ol_name="${UsedOverlays[i]}"
local dir="${OverlayInfo[${ol_name}:modulefiles_root]}/$1/${__MODULEFILES_DIR__}"
local dir="${OverlayInfo[${ol_name}:modulefiles_root]}/${grp}/${__MODULEFILES_DIR__}"
[[ -d "${dir}" ]] || continue
std::prepend_path MODULEPATH "${dir}"
[[ "${OverlayInfo[${ol_name}:type]}" == "${ol_replacing}" ]] && break
@@ -2169,19 +2170,20 @@ subcommand_unuse() {
#..............................................................
unuse_group() {
(( ${GroupDepths[${arg}]} > 0 )) && \
die_grp_invalid "${arg}"
local -- grp="$1"
(( ${GroupDepths[${grp}]} > 0 )) && \
die_grp_invalid "${grp}"
if [[ -v PMODULES_LOADED_${arg^^} ]]; then
local var="PMODULES_LOADED_${arg^^}"
if [[ -v PMODULES_LOADED_${grp^^} ]]; then
local var="PMODULES_LOADED_${grp^^}"
[[ -n "${!var}" ]] && \
die_grp_cannot_be_removed "${arg}"
die_grp_cannot_be_removed "${grp}"
fi
std::remove_path UsedGroups "${arg}"
std::remove_path UsedGroups "${grp}"
local overlay
for overlay in "${UsedOverlays[@]}"; do
local dir="${OverlayInfo[${overlay}:modulefiles_root]}"
dir+="/${arg}/${__MODULEFILES_DIR__}"
dir+="/${grp}/${__MODULEFILES_DIR__}"
std::remove_path MODULEPATH "${dir}"
done
}