X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.profile;h=581885092317f725fe1341be58fd61b99b5da300;hp=b336e2ad0489be9583bd0ba8b7cba5fd29cb5160;hb=542f2a97ae5094eb88116ffa02fc441ba95dae47;hpb=c5d595d83cab2e180a71bc65b9e4a8a2f71772db

diff --git a/.profile b/.profile
index b336e2a..5818850 100644
--- a/.profile
+++ b/.profile
@@ -192,15 +192,14 @@ if [ -t 0 ] ; then
          ;;
       esac
 
-      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
+      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
       . "$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
@@ -305,8 +304,16 @@ fi
 #    fi
 # fi
 
-if [ -n "$SSH_CONNECTION" -a -z "$STY" -a -t 0 ] &&
-   which screen >/dev/null 2>&1
+# 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 -a -x /usr/bin/screen ]
 then
-   exec screen -xRR -S default
+   exec /usr/bin/screen -xRR -S default
 fi