.profile: Add `>` as a prompt character for non-bash shells

[dotfiles.git] / .profile

diff --git a/.profile b/.profile
index f222e80f965b338391c866a1698fbd9d1002fd65..4e9958e77ef43e744245e8ca4bb17693eb308692 100644 (file)
--- a/.profile
+++ b/.profile
@@ -39,7 +39,7 @@ fi
 ### umask 022 is less restrictive, 077 more paranoid
 umask 077
 
-PATH="$HOME"/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 MANPATH="$HOME"/man:/usr/local/man:/usr/share/man:/usr/man
 # LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib
 export PATH MANPATH # LD_LIBRARY_PATH
@@ -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