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

modulecmd: simpler test whether a overlay can be loaded or unloaded

Browse Source
This commit is contained in:
gsell
2021-12-09 17:47:16 +01:00
parent 941fa376a9
commit f0f6e6bd0a
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modulecmd.bash.in
+14 -21
View File
@@ -1406,17 +1406,13 @@ subcommand_use() {
use () {
use_overlay() {
local ol_name_or_dir="$1"
if [[ -n ${LOADEDMODULES} ]]; then
if [[ $LOADEDMODULES == *:* ]] \
|| [[ $LOADEDMODULES != Pmodules/* ]]; then
std::error "%s %s: %s" \
"${CMD}" "${subcommand}" \
"overlay cannot be added since some modules are already loaded!"
std::die 3 "%s %s: %s -- %s" \
"${CMD}" "${subcommand}" \
"overlay failed" \
"${ol_name_or_dir}"
fi
if [[ -n "${LOADEDMODULES}" ]] && \
[[ "${LOADEDMODULES}" != Pmodules/+([.0-9rc]) ]]; then
std::die 3 "%s %s: %s %s" \
"${CMD}" "${subcommand}" \
"overlay cannot be added since some" \
"modules are already loaded!"
fi
local ol_dir=''
@@ -1616,16 +1612,13 @@ subcommand_unuse() {
#..............................................................
unuse_overlay() {
local ol_name_or_dir="$1"
if [[ -n ${LOADEDMODULES} ]]; then
if [[ $LOADEDMODULES == *:* ]] || [[ $LOADEDMODULES != Pmodules/* ]]; then
std::error "%s %s: %s" \
"${CMD}" "${subcommand}" \
"overlay cannot be removed since some modules are still loaded!"
std::die 3 "%s %s: %s -- %s" \
"${CMD}" "${subcommand}" \
"overlay failed" \
"${ol_name_or_dir}"
fi
if [[ -n "${LOADEDMODULES}" ]] && \
[[ "${LOADEDMODULES}" != Pmodules/+([.0-9rc]) ]]; then
std::die 3 "%s %s: %s %s" \
"${CMD}" "${subcommand}" \
"overlay cannot be removed since" \
"some modules are still loaded!"
fi
local ol_dir=''