X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=89b65dc3c6b58e03234e43ac0dba93c9e830cc65;hb=bbaf1218569bfccc59bece1d5735f91efa6a2e8c;hp=9fce67bc327fa14bcdac4fc7fcd900505e683998;hpb=41c57a5fd1cf36e9115e8904c068b5777a49ba3e;p=dotfiles.git

diff --git a/.profile b/.profile
index 9fce67b..89b65dc 100644
--- a/.profile
+++ b/.profile
@@ -192,15 +192,19 @@ if [ -t 0 ] ; then
          ;;
       esac
 
-      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
+      if [ -r "$HOME"/admin/prog/bash_prompt ]; then
+         . "$HOME"/admin/prog/bash_prompt
+         OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\${HOSTNAME::5} \`short_curdir\` \\$"
+      else
+         OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
+      fi
       . "$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,18 +308,3 @@ 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