.profile: use concatenation instead of `+=' for older shells

[dotfiles.git] / .profile

diff --git a/.profile b/.profile
index 6254c067081a7a353dbdf6a0ea611cad9062adf7..d4b94b089914a4392efded865f80d71a3d1609bc 100644 (file)
--- a/.profile
+++ b/.profile
@@ -75,8 +75,12 @@ if [ -t 0 ] ; then
       ;;
    esac
 
+   if [ -x /usr/bin/dircolors ]; then
+       test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+   fi
+
    PAGER=less
-   LESS="-gimq"
+   LESS="FRXgimq"
    case "$LC_CTYPE" in
       *UTF-8) LESSCHARSET=utf-8
       ;;
@@ -85,7 +89,7 @@ if [ -t 0 ] ; then
       ;;
    esac
    #LESSCHARDEF=32c.
-   LESSEDIT='vim ?lm+%lm. -- %f'
+   LESSEDIT='vim ?lt+%lt. -- %f'
    export PAGER LESS LESSCHARSET LESSEDIT # LESSCHARDEF
 
    EDITOR="$HOME"/.vim/vim.sh
@@ -135,7 +139,24 @@ if [ -t 0 ] ; then
    case "$SHELL" in
       */bash)
          shopt -s checkwinsize
-         OPS1='\u@\h '
+         # display the user, host and current working directory
+         # in the terminal title
+         case "$TERM" in
+            *rxvt*|screen*|*term*|vt100)
+               OPS1="\[\033]0;\u@\h:\w\007\]"
+               case "$TERM" in
+                  screen*)
+                     OPS1=${OPS1}"\[\033k\u@\h:\w\033\\\]" # Set screen/tmux caption
+                  ;;
+               esac
+            ;;
+
+            *)
+               OPS1=""
+            ;;
+         esac
+
+         OPS1=${OPS1}"\u@\h \W "
          . "$ENV"
          ;;
       *)
@@ -143,16 +164,8 @@ if [ -t 0 ] ; then
          ;;
    esac
 
-   export OPS1
-
-   case "$TERM" in
-      *rxvt*|screen*|*term*|vt100)
-         if [ -x "`which xtitle 2>/dev/null`" ]; then
-            PROMPT_COMMAND=xtitle
-            export PROMPT_COMMAND
-         fi
-      ;;
-   esac
+   #PROMPT_DIRTRIM=2
+   export OPS1 # PROMPT_DIRTRIM
 
    ### biff controls new mail notification
    #biff n
@@ -177,6 +190,10 @@ if [ -t 0 ] ; then
    export HGUSER
 
    unset name email
+
+   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