From 0d088cbcab34cc330f63bcd718282ec10fd5a0e6 Mon Sep 17 00:00:00 2001 From: "kebler.net" Date: Wed, 9 Mar 2022 17:02:39 -0800 Subject: [PATCH] added BASH_SHELL_DEV to list directories to look for modules --- load.sh | 2 +- module.lib | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/load.sh b/load.sh index 978ee28..c8821cc 100755 --- a/load.sh +++ b/load.sh @@ -25,7 +25,7 @@ unset BASH_SHELL_LOADED module_load shell-process-directory for dir in ${1:-$BASH_SHELL_DIRS}; do - echo $dir $BASH_SHELL_BASE + # echo $dir $BASH_SHELL_BASE shell_process_directory $dir [[ "$dir" = "$BASH_SHELL_BASE" ]] && export BASH_SHELL_BASE_LOADED=true done diff --git a/module.lib b/module.lib index b12086a..d8219c9 100644 --- a/module.lib +++ b/module.lib @@ -38,7 +38,8 @@ local MODULE=$1 # MODULE_DIRS is array set in the environment and is an array of additional directories to # search for modules. This makes is easy to include a custom module libraries outside -# the shell system. These take precedence over any modules found in shell directories below +# the shell system. These take precedence over any modules found in shell directories below. +# Precedence is first in list to last. if [[ $MODULE_DIRS ]]; then for DIR in "${MODULE_DIRS[@]}" @@ -54,6 +55,7 @@ fi # in revsere order, user or network repos over host over base DIRS=( ${BASH_SHELL_DIRS:-$BASH_SHELL_BASE} ) [ -d $HOME/$BASH_SHELL_USER ] && DIRS=("${DIRS[@]}" "$HOME/$BASH_SHELL_USER") +[ -d $BASH_SHELL_DEV ] && DIRS=("${DIRS[@]}" "$BASH_SHELL_DEV") cnt=${#DIRS[@]} for ((i=1;i<=cnt;i++)); do