.profile: Extend checks for interactive mode

[dotfiles.git] / .profile

diff --git a/.profile b/.profile
index 66fe2fa3fbf306f365d5452898b1d3e544e6e78d..9fce67bc327fa14bcdac4fc7fcd900505e683998 100644 (file)
--- a/.profile
+++ b/.profile
@@ -80,7 +80,7 @@ if [ -t 0 ] ; then
 
    stty sane erase ^H
 
-   if [ -n "`which less 2>/dev/null`" ]; then
+   if which less >/dev/null 2>&1; then
       HAS_LESS=true
    fi
 
@@ -304,3 +304,18 @@ fi
 #
 #    fi
 # fi
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return ;;
+esac
+
+# Stop if non-interactive shell
+[ -z "$PS1" ] && return
+
+if [ -n "$SSH_CONNECTION" -a -z "$STY" -a -t 0 ] &&
+   which screen >/dev/null 2>&1
+then
+   exec screen -xRR -S default
+fi