diff --git a/etc/bashrc b/etc/bashrc
index 77bbfa9ca..d92b469b0 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -42,7 +42,7 @@ export WM_PROJECT_VERSION=dev
 #
 # Please set to the appropriate path if the default is not correct.
 #
-[ ${BASH_SOURCE:-$0} ] && \
+[ "$BASH" -o "$ZSH_NAME" ] && \
 export FOAM_INST_DIR=$(cd $(dirname ${BASH_SOURCE:-$0})/../.. && pwd -P) || \
 export FOAM_INST_DIR=$HOME/$WM_PROJECT
 # export FOAM_INST_DIR=~$WM_PROJECT
@@ -211,6 +211,6 @@ unset cleaned foamClean foamOldDirs
 
 # Source the bash completion file:
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-. $WM_PROJECT_DIR/etc/config.sh/bash_completion
+[ "$BASH" ] && . $WM_PROJECT_DIR/etc/config.sh/bash_completion
 
 #------------------------------------------------------------------------------