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

modulecmd: some unnecessary return statements removed after std::die

Browse Source
This commit is contained in:
gsell
2021-05-20 14:41:19 +02:00
parent fd21f98254
commit f31dc38513
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modulecmd.bash.in
+5 -15
View File
@@ -1512,7 +1512,6 @@ subcommand_use() {
"${CMD}" "${subcommand}" \
"illegal group" \
"${arg}"
return
fi
# arg must be a directory!
if [[ ! -d ${arg} ]]; then
@@ -1520,7 +1519,6 @@ subcommand_use() {
"${CMD}" "${subcommand}" \
"illegal argument" \
"${arg}"
return
fi
local dir="$(cd "${arg}" && pwd)"
@@ -1700,7 +1698,6 @@ subcommand_unuse() {
"${CMD}" "${subcommand}" \
"illegal group" \
"${arg}"
return
fi
# user wants to append a directory to MODULEPATH
if [[ ! -d ${arg} ]]; then
@@ -1708,21 +1705,14 @@ subcommand_unuse() {
"${CMD}" "${subcommand}" \
"illegal argument" \
"${arg}"
return
fi
local dir="$(cd "${arg}" && pwd)"
local overlay
for overlay in "${OverlayList[@]}"; do
if [[ ${dir}/ =~ ^${overlay}/ ]]; then
# dir is in one of our used overlays
std::die 3 "%s %s: %s -- %s" \
"${CMD}" "${subcommand}" \
"illegal argument" \
"${arg}"
return
fi
done
if [[ -r ${dir}/config/overlay.conf ]] || [[ -v OverlayDict[${dir}] ]]; then
unuse_overlay "${dir}"
return
fi
# argument is a modulepath
std::remove_path MODULEPATH "${dir}"