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

diff --git a/.profile b/.profile
index f222e80..89b65dc 100644
--- 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
 
@@ -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