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.
---
 sh/profile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sh/profile')

diff --git a/sh/profile b/sh/profile
index e190d6ba..78fbd2cc 100644
--- a/sh/profile
+++ b/sh/profile
@@ -10,7 +10,7 @@ for profile in "$HOME"/.profile.d/*.sh ; do
 done
 unset -v profile
 
-# If the shell is interactive, and ~/.shrc exists, source that too
-case $- in
-    *i*) [ -f "$HOME"/.shrc ] && . "$HOME"/.shrc ;;
-esac
+# If ~/.shrc exists, source that too; the test for interactivity is in there
+if [ -f "$HOME"/.shrc ] ; then
+    source "$HOME"/.shrc
+fi
-- 
cgit v1.2.3