diff --git a/myshell_load_defaults b/myshell_load_defaults index c6bd5b6..e35cd6d 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -53,6 +53,11 @@ if ! $SSHS; then . "${MSC_BASE}/aliases" fi + if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases + fi + + if [ -f "${MSC_BASE}/PS1" ]; then . "${MSC_BASE}/PS1" fi diff --git a/myshell_load_fortmpconfig b/myshell_load_fortmpconfig index 55cfc41..5913285 100644 --- a/myshell_load_fortmpconfig +++ b/myshell_load_fortmpconfig @@ -6,10 +6,16 @@ if [ -d "${HOME}/bin" ] ; then export PATH fi -if [ -f ~/.aliases ]; then - . ~/.aliases +# replaced with ~/.bash_aliases +#if [ -f ~/.aliases ]; then +# . ~/.aliases +#fi + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases fi + export WORK=~/Work [ -z "${USERNAME+x}" ] && export USERNAME="$USER"