|
@@ -1,4 +1,4 @@
|
|
-# $HOME/.bashrc
|
|
|
|
|
|
+# ${HOME}/.bashrc
|
|
#
|
|
#
|
|
# this file is sourced by all *interactive* bash shells on startup,
|
|
# this file is sourced by all *interactive* bash shells on startup,
|
|
# including some apparently interactive shells such as scp and rcp
|
|
# including some apparently interactive shells such as scp and rcp
|
|
@@ -8,21 +8,21 @@
|
|
# 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.
|
|
-if [[ $- != *i* ]] ; 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
|
|
# load all files from .shell/bashrc.d directory
|
|
-if [ -d $HOME/.shellrc/bashrc.d ]; then
|
|
|
|
- for file in $HOME/.shellrc/bashrc.d/*.bash; do
|
|
|
|
- source $file
|
|
|
|
|
|
+if [ -d ${HOME}/.shellrc/bashrc.d ]; then
|
|
|
|
+ for file in ${HOME}/.shellrc/bashrc.d/*.bash; do
|
|
|
|
+ source ${file}
|
|
done
|
|
done
|
|
fi
|
|
fi
|
|
|
|
|
|
# load all files from .shell/rc.d directory
|
|
# load all files from .shell/rc.d directory
|
|
-if [ -d $HOME/.shellrc/rc.d ]; then
|
|
|
|
- for file in $HOME/.shellrc/rc.d/*.sh; do
|
|
|
|
- source $file
|
|
|
|
|
|
+if [ -d ${HOME}/.shellrc/rc.d ]; then
|
|
|
|
+ for file in ${HOME}/.shellrc/rc.d/*.sh; do
|
|
|
|
+ source ${file}
|
|
done
|
|
done
|
|
fi
|
|
fi
|