|
@@ -8,21 +8,24 @@
|
|
# test for an interactive shell. there is no need to set anything
|
|
# test for an interactive shell. there is no need to set anything
|
|
# past this point for scp and rcp, and it's important to refrain from
|
|
# past this point for scp and rcp, and it's important to refrain from
|
|
# outputting anything in those cases.
|
|
# outputting anything in those cases.
|
|
|
|
+
|
|
|
|
+SHELLRC_HOME="$(dirname $(readlink -f ${BASH_SOURCE[0]}))"
|
|
|
|
+
|
|
if [[ $- != *i* ]] || [[ -z "$PS1" ]]; then
|
|
if [[ $- != *i* ]] || [[ -z "$PS1" ]]; then
|
|
# shell is non-interactive. be done now!
|
|
# shell is non-interactive. be done now!
|
|
return
|
|
return
|
|
fi
|
|
fi
|
|
|
|
|
|
-# load all files from .shell/bashrc.d directory
|
|
|
|
-if [ -d ${HOME}/.shellrc/bashrc.d ]; then
|
|
|
|
- for file in ${HOME}/.shellrc/bashrc.d/*.bash; do
|
|
|
|
|
|
+# load all files from .shell/rc.d directory
|
|
|
|
+if [ -d ${SHELLRC_HOME}/rc.d ]; then
|
|
|
|
+ for file in ${SHELLRC_HOME}/rc.d/*.sh; do
|
|
source ${file}
|
|
source ${file}
|
|
done
|
|
done
|
|
fi
|
|
fi
|
|
|
|
|
|
-# load all files from .shell/rc.d directory
|
|
|
|
-if [ -d ${HOME}/.shellrc/rc.d ]; then
|
|
|
|
- for file in ${HOME}/.shellrc/rc.d/*.sh; do
|
|
|
|
|
|
+# load all files from .shell/bashrc.d directory
|
|
|
|
+if [ -d ${SHELLRC_HOME}/bashrc.d ]; then
|
|
|
|
+ for file in ${SHELLRC_HOME}/bashrc.d/*.bash; do
|
|
source ${file}
|
|
source ${file}
|
|
done
|
|
done
|
|
fi
|
|
fi
|