Fix checking for the shell being run is bash or zsh

4 years ago · 998695b1ba
parent 3afa0e8930
commit 998695b1ba
2 changed files with 2 additions and 2 deletions
--- a/base/.profile
+++ b/base/.profile
@ -42,8 +42,7 @@ if [ -d "${XDG_CONFIG_HOME}/profile/profile.d" ]; then
    done
 fi

-
-if [ "${SHELL}" = /bin/bash ] || [ "${SHELL}" = /usr/local/bin/bash ]; then
+if [ "${BASH_VERSION}" != "" ] && [ "$(ps -p $$ -ocomm=)" != sh ]; then
    # shellcheck disable=SC1090
    if [ -f "${HOME}/.bashrc" ]; then
        . "${HOME}/.bashrc"
--- a/base/.zprofile
+++ b/base/.zprofile
@ -0,0 +1 @@
+source $HOME/.profile