Make check for "interactive shells" more robust

diff --git a/sys/bashrc b/sys/bashrc
index 559cc8c54b85f96ce1d3ad8f18cd012de2c85dc0..40087fe34706f1da620ee249067091579d0c3660 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -13,7 +13,10 @@ BASHRCREAD="true"
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
 
 # Interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+       *i*) ;;
+       *) return ;;
+esac
 
 # Initialize keychain(1) ssh-agent and gpg-agent helper
 type -t keychain >/dev/null \

diff --git a/sys/profile b/sys/profile
index 0e69c899f74138f13e080bbd8b44eba7ac4ac64f..207bf5baf2134451e606fec6158fa0e02b60b2a8 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -153,7 +153,10 @@ fi
 [ -r "/var/lib/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
 # interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+       *i*) ;;
+       *) return ;;
+esac
 
 # validate terminal definition
 type -t tset >/dev/null && eval `tset -s -Q`