From 4d612862149ca2337f0e78a14eb6a2f43de0ab5c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 17 Aug 2016 18:42:56 +1200
Subject: 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.
---
 bash/bash_profile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bash/bash_profile')

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
-- 
cgit v1.2.3