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

diff --git a/.profile b/.profile
index 66fe2fa..93756db 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
 
@@ -175,33 +175,20 @@ if [ -t 0 ] ; then
    fi
 
    if test -n "$BASH_VERSION"; then
-      # display the user, host and current working directory
-      # in the terminal title
-      case "$TERM" in
-         *rxvt*|screen*|*term*|vt100)
-            OPS1="\[\033]0;${debian_chroot:+($debian_chroot)}\u@\h:\w\007\]"
-            case "$TERM" in
-               screen*)
-                  OPS1=${OPS1}"\[\033k${debian_chroot:+($debian_chroot)}\u@\h:\w\033\\\\\]" # Set screen/tmux caption
-               ;;
-            esac
-         ;;
+      if [ -r "$HOME"/admin/prog/bash_prompt ]; then
+         . "$HOME"/admin/prog/bash_prompt
+         set_prompts
+         unset set_prompts
+      else
+         OPS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
+      fi
 
-         *)
-            OPS1=""
-         ;;
-      esac
-
-      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
-
    ### biff controls new mail notification
    #biff n
    ### mesg controls messages (write/talk) from other users