X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.profile;h=4e9958e77ef43e744245e8ca4bb17693eb308692;hp=66fe2fa3fbf306f365d5452898b1d3e544e6e78d;hb=cc4271cd8c256a378472017827a04c83f951347c;hpb=95c6fd411d2c07565de22cb093306616b4ea8418

diff --git a/.profile b/.profile
index 66fe2fa..4e9958e 100644
--- 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
 
@@ -196,11 +196,10 @@ if [ -t 0 ] ; then
       . "$ENV"
 
    else
-      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
+      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` >"
    fi
 
-   #PROMPT_DIRTRIM=2
-   export OPS1 # PROMPT_DIRTRIM
+   export OPS1
 
    ### biff controls new mail notification
    #biff n
@@ -304,3 +303,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