aboutsummaryrefslogtreecommitdiff
path: root/bash/bash_profile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-08-17 18:42:56 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-08-17 18:45:49 +1200
commit4d612862149ca2337f0e78a14eb6a2f43de0ab5c (patch)
tree8bf5fe396b93a7e0e1a5c3245f40708e434a9974 /bash/bash_profile
parentMove completion section below function section (diff)
downloaddotfiles-4d612862149ca2337f0e78a14eb6a2f43de0ab5c.tar.gz
dotfiles-4d612862149ca2337f0e78a14eb6a2f43de0ab5c.zip
Move interactive tests back into *rc files
I don't fully understand why I have to do it this way yet, but if I don't, calling SSH with a command raises "stdin: not a terminal" because ~/.bashrc was called.
Diffstat (limited to 'bash/bash_profile')
-rw-r--r--bash/bash_profile8
1 files changed, 4 insertions, 4 deletions
diff --git a/bash/bash_profile b/bash/bash_profile
index d0850004..76758083 100644
--- a/bash/bash_profile
+++ b/bash/bash_profile
@@ -23,7 +23,7 @@ if [[ -d $HOME/.bash_profile.d ]] ; then
unset -v bash_profile
fi
-# If the shell is interactive, and ~/.bashrc exists, source that too
-case $- in
- *i*) [[ -f "$HOME"/.bashrc ]] && source "$HOME"/.bashrc ;;
-esac
+# If ~/.bashrc exists, source that too; the test for interactivity is in there
+if [[ -f $HOME/.bashrc ]] ; then
+ source "$HOME"/.bashrc
+fi