X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=dc6f2935545b54d29213ac6850af837d59211a18;hb=5ffe65c22c7d5be88defda6f282b10ddbfd2fce0;hp=aedf458e7b192eb600b5774c0d843fefb1e1cc9b;hpb=8c72229bb26bef89357f55320fb1d7b06a7b4aa8;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index aedf458..dc6f293 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,10 +2,15 @@ cgmem_which_prompt() {
    local _cgmem_which
    _cgmem_which="`cgmem_which 2>/dev/null`"
    if [ -n "$_cgmem_which" ]; then
-      echo "[$_cgmem_which] "
+      _cgmem_which=" $_cgmem_which"
    fi
+   echo "$_cgmem_which"
 }
 
+# Cut directories to 20% of the terminal width; add space for 3 dots
+_DIR_LENGTH=`awk "END { print int(0.2 * ${COLUMNS:-80}) }" </dev/null`
+_DIR_LENGTH_DOTS=`expr $_DIR_LENGTH + 3`
+
 short_curdir() {
    if [ "$PWD" = / ]; then
       echo /
@@ -17,8 +22,8 @@ short_curdir() {
    fi
    local _short_curdir
    _short_curdir="${PWD##*/}" # cut all directories, get base name
-   if [ "${#_short_curdir}" -gt 18 ]; then
-      _short_curdir="${_short_curdir::15}..." # cut long string
+   if [ "${#_short_curdir}" -gt $_DIR_LENGTH_DOTS ]; then
+      _short_curdir="${_short_curdir::$_DIR_LENGTH}..." # cut long string
    fi
    echo "${_short_curdir}"
 }
@@ -75,13 +80,11 @@ prompt_git() {
             set -- `git rev-list --count --left-right @{u}...HEAD`
             left=$1
             right=$2
-            if [ "$left" -gt 0 -o "$right" -gt 0 ]; then
-                if [ "$left" -gt 0 ]; then
-                    s="$s-$left"
-                fi
-                if [ "$right" -gt 0 ]; then
-                    s="$s+$right"
-                fi
+            if [ "$left" -gt 0 ]; then
+                s="$s-$left"
+            fi
+            if [ "$right" -gt 0 ]; then
+                s="$s+$right"
             fi
         fi
 
@@ -104,36 +107,40 @@ prompt_git() {
 #fi
 
 set_prompts() {
-      OPS1=''
+      PS1=''
+      local _SHORT_PROMPT='[\A`cgmem_which_prompt`] \u@${HOSTNAME::5}:`short_curdir`'
       # 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\]"
+            PS1="\033]0;${debian_chroot:+($debian_chroot)}\u@\h:\w\007" # Set xterm title/icon
             case "$TERM" in
                screen*)
-                  OPS1+="\[\033k${debian_chroot:+($debian_chroot)}"
-                  OPS1+="\u@\h:\w\033\\\\\]" # Set screen/tmux caption
+                  PS1="\033P${PS1}\033\\\\" # Set xterm title/icon under screen/tmux
+                  if [ -z "$MC_SID" ]; then
+                     PS1+="\033k${_SHORT_PROMPT}\033\\\\" # Set screen/tmux caption
+                  fi
                ;;
             esac
          ;;
 
          *)
-            OPS1=""
+            PS1=""
          ;;
       esac
 
-   OPS1+="${debian_chroot:+($debian_chroot)}"
-   OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #PS1+='\033k\033\\'
+
+   PS1="\[$PS1\]"
+   PS1+='${debian_chroot:+($debian_chroot)}'
+   PS1+=${_SHORT_PROMPT}
    if test -x /usr/bin/git >/dev/null 2>&1; then
       #if [ "`type -t __git_ps1`" = function ]; then
-      #   OPS1+="\$(__git_ps1)"
+      #   PS1+='$(__git_ps1)'
       #else
-         OPS1+="\$(prompt_git)"
+         PS1+='$(prompt_git)'
       #fi
    fi
-   # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #OPS1+="\[\033k\033\\\\\]"
-   OPS1+=" \$SHLVL\\$ "
-   export OPS1
+   PS1+=' $SHLVL\$ '
 }