XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2067 from gaelicWizard/BASH_IT_BASHRC 

lib/helpers: eliminate assumptions about login shells
pull/2075/head
Noah Gorny 2022-01-29 22:42:21 +02:00 committed by GitHub
parent 7e79212dff c08267e25d
commit 1d6f4d747b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/helpers.bash
View File

@ -654,14 +654,9 @@ function _bash-it-restart() {
_about 'restarts the shell in order to fully reload it' _about 'restarts the shell in order to fully reload it'
_group 'lib' _group 'lib'
local saved_pwd="${PWD}" init_file local saved_pwd="${PWD}" init_file="${BASH_IT_BASHRC:-${HOME?}/.bashrc}"
if shopt -q login_shell; then exec "${0/-/}" --rcfile <(echo "source \"${init_file}\"; cd \"$saved_pwd\"")
init_file=.bash_profile
else
init_file=.bashrc
fi
exec "${0/-/}" --rcfile <(echo "source \"$HOME/$init_file\"; cd \"$saved_pwd\"")
} }
function _bash-it-reload() { function _bash-it-reload() {
@ -669,15 +664,8 @@ function _bash-it-reload() {
_group 'lib' _group 'lib'
pushd "${BASH_IT?}" > /dev/null || return pushd "${BASH_IT?}" > /dev/null || return
# shellcheck disable=SC1090 # shellcheck disable=SC1090
if shopt -q login_shell; then source "${BASH_IT_BASHRC:-${HOME?}/.bashrc}"
# shellcheck source-path=$HOME
source ~/.bash_profile
else
# shellcheck source-path=$HOME
source ~/.bashrc
fi
popd > /dev/null || return popd > /dev/null || return
} }