diff --git a/functions.sh b/functions.sh index b939e7e..f7607c8 100644 --- a/functions.sh +++ b/functions.sh @@ -249,7 +249,7 @@ sshs() { # VIMMKTMPCMD="mktemp ${XDG_RUNTIME_DIR}/vimrc.XXXXXXXX.conf" local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf) - local FILELIST=( "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${HOME}/.aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" ) + local FILELIST=( "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" ) # Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first cat << EOF >> "${TMPBASHCONFIG}" diff --git a/myshell_load_defaults b/myshell_load_defaults index fdb1588..f15432b 100644 --- a/myshell_load_defaults +++ b/myshell_load_defaults @@ -19,11 +19,6 @@ if ! $SSHS; then # User specific aliases and function - if [ -d "${HOME}/bin" ] ; then - pathmunge "${HOME}/bin" - export PATH - fi - if [ -d "${MYSHELLCONFIG_BASE}/bin" ] ; then pathmunge "${MYSHELLCONFIG_BASE}/bin" export PATH @@ -38,10 +33,6 @@ if ! $SSHS; then . "${MYSHELLCONFIG_BASE}/aliases" fi - if [ -f ~/.aliases ]; then - . ~/.aliases - fi - if [ -f "${MYSHELLCONFIG_BASE}/PS1" ]; then . "${MYSHELLCONFIG_BASE}/PS1" fi @@ -52,6 +43,11 @@ if ! $SSHS; then done fi + . + if [ -f "${MYSHELLCONFIG_BASE}/PS1" ]; then + . "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" + fi + ######################################################################################### diff --git a/myshell_load_fortmpconfig b/myshell_load_fortmpconfig new file mode 100644 index 0000000..1ff8bec --- /dev/null +++ b/myshell_load_fortmpconfig @@ -0,0 +1,12 @@ +#!/bin/bash + +# load this in temporary config and also in myshellconfig permanent +if [ -d "${HOME}/bin" ] ; then + pathmunge "${HOME}/bin" + export PATH +fi + +if [ -f ~/.aliases ]; then + . ~/.aliases +fi +