mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-26 01:23:09 +02:00
modulecmd: read dependencies from file in same directory as modulefile
This commit is contained in:
@@ -873,13 +873,17 @@ subcommand_load() {
|
|||||||
# continue if already loaded
|
# continue if already loaded
|
||||||
[[ ":${LOADEDMODULES}:" == *:${m}:* ]] && continue
|
[[ ":${LOADEDMODULES}:" == *:${m}:* ]] && continue
|
||||||
|
|
||||||
# show info file if exist, load dependencies and the module itself
|
# show info file if exist
|
||||||
local prefix=''
|
local prefix=''
|
||||||
get_module_prefix prefix "${current_modulefile}"
|
get_module_prefix prefix "${current_modulefile}"
|
||||||
if [[ -n ${prefix} ]]; then
|
[[ -n ${prefix} && -r "${prefix}/.info" ]] && cat "${prefix}/.info" 1>&2
|
||||||
test -r "${prefix}/.info" && cat "$_" 1>&2
|
|
||||||
test -r "${prefix}/.dependencies" && load_dependencies "$_"
|
# load dependencies
|
||||||
fi
|
local -- deps_file="${current_modulefile%/*}/.deps-${current_modulefile##*/}"
|
||||||
|
if [[ ! -r "${deps_file}" && -n "${prefix}" ]]; then
|
||||||
|
deps_file="${prefix}/.dependencies"
|
||||||
|
fi
|
||||||
|
test -r "${deps_file}" && load_dependencies "$_"
|
||||||
local output=''
|
local output=''
|
||||||
output=$("${modulecmd}" 'bash' "${opts[@]}" 'load' \
|
output=$("${modulecmd}" 'bash' "${opts[@]}" 'load' \
|
||||||
"${current_modulefile}" 2> "${TmpFile}")
|
"${current_modulefile}" 2> "${TmpFile}")
|
||||||
|
|||||||
Reference in New Issue
Block a user