X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=20ba5a1aef033a63a6051670938bfb7a3e5a7f16;hb=171941f5107d46317e3487d611e60c59054b7782;hp=4de74a7be46c937956d5e276ed72945199c17581;hpb=d06fbeb326fcb79a1ae26376ac8dfab12d76754d;p=dotfiles.git

diff --git a/.profile b/.profile
index 4de74a7..20ba5a1 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
 
@@ -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
-         ;;
-
-         *)
-            OPS1=""
-         ;;
-      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 \\$"
+      fi
 
-      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
@@ -226,9 +213,9 @@ if [ -t 0 ] ; then
 
    unset name email
 
-   if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
-      tee $HOME/.motd < /etc/motd
-   fi
+   #if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
+   #   tee $HOME/.motd < /etc/motd
+   #fi
 fi
 
 # No need to set DISPLAY - ssh sets DISPLAY and calls xauth