X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=903a58b8bbaefd02d04a141006f268d7619307b7;hb=7bc97fc1d57dbae21c1feab20ce112e3be78c634;hp=e04e6e86e83bc30556d3d6631b872e1b21280ada;hpb=a1df7fa8cc5301684ae8eb8bc2852a05531b7816;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index e04e6e8..903a58b 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,10 +2,26 @@ 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"
 }
 
+last_cmd_status() {
+    local _last_status=$?
+    if [ $_last_status -eq 0 ]; then
+        echo '+'
+    elif [ $_last_status -ge 1 ]; then
+        echo '-'
+    else
+        echo '?'
+    fi
+}
+
+# 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 +33,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}"
 }
@@ -27,6 +43,16 @@ short_curdir() {
 # https://github.com/necolas/dotfiles/blob/master/shell/bash_prompt and
 # https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
 
+_recurse_submodules() {
+    local command="$@"
+    local output="$($command 2>/dev/null)"
+    if [ -n "$output" ]; then
+        echo -n "$output"
+        return
+    fi
+    git submodule --quiet foreach $command 2>/dev/null
+}
+
 prompt_git() {
     local s=""
     local branchName=""
@@ -41,22 +67,22 @@ prompt_git() {
             #git update-index --really-refresh -q &>/dev/null
 
             # check for unstaged changes
-            if [ -n "$(git ls-files --modified)" ]; then
+            if [ -n "$(_recurse_submodules git ls-files --modified :/)" ]; then
                 s="$s*";
             fi
 
             # check for uncommitted changes in the index
-            if ! $(git diff --quiet --ignore-submodules --cached); then
+            if [ -n "$(_recurse_submodules git diff --ignore-submodules --cached)" ]; then
                 s="$s+";
             fi
 
             # check for stashed files
-            if $(git rev-parse --verify refs/stash &>/dev/null); then
+            if [ -n "$(_recurse_submodules git rev-parse --verify refs/stash)" ]; then
                 s="$s$";
             fi
 
             # check for untracked files
-            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+            if [ -n "$(_recurse_submodules git ls-files --others --exclude-standard :/)" ]; then
                 s="$s%";
             fi
 
@@ -69,55 +95,69 @@ prompt_git() {
                       git rev-parse --short HEAD 2> /dev/null || \
                       printf "(unknown)")"
 
-        [ -n "$s" ] && s=" [$s]"
+        up=`git rev-parse --abbrev-ref @{u} 2>/dev/null`
+        if [ -n "$up" -a "$up" != "@{u}" ]; then
+            local left right
+            set -- `git rev-list --count --left-right @{u}...HEAD`
+            left=$1
+            right=$2
+            if [ "$left" -gt 0 ]; then
+                s="$s-$left"
+            fi
+            if [ "$right" -gt 0 ]; then
+                s="$s+$right"
+            fi
+        fi
+
+        [ -n "$s" ] && s=" $s"
         printf " (%s)" "$branchName$s"
     fi
 }
 
-if test -x /usr/bin/git >/dev/null 2>&1; then
-   if [ "`type -t __git_ps1`" != function ]; then
-      git_sh_prompt=`git --exec-path`/git-sh-prompt
-      test -r $git_sh_prompt && . $git_sh_prompt || :
-   fi
-   if [ "`type -t __git_ps1`" = function ]; then
-      GIT_PS1_SHOWDIRTYSTATE=true
-      GIT_PS1_SHOWSTASHSTATE=true
-      GIT_PS1_SHOWUNTRACKEDFILES=true
-      GIT_PS1_SHOWUPSTREAM=verbose
-   fi
-fi
-
-set_prompts() {
-      OPS1=''
+#if test -x /usr/bin/git >/dev/null 2>&1; then
+#   if [ "`type -t __git_ps1`" != function ]; then
+#      git_sh_prompt=`git --exec-path`/git-sh-prompt
+#      test -r $git_sh_prompt && . $git_sh_prompt || :
+#   fi
+#   if [ "`type -t __git_ps1`" = function ]; then
+#      GIT_PS1_SHOWDIRTYSTATE=true
+#      GIT_PS1_SHOWSTASHSTATE=true
+#      GIT_PS1_SHOWUNTRACKEDFILES=true
+#      GIT_PS1_SHOWUPSTREAM=verbose
+#   fi
+#fi
+
+set_prompt() {
+      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=""
-         ;;
       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)"
-      else
-         OPS1+="\$(prompt_git)"
-      fi
+      #if [ "`type -t __git_ps1`" = function ]; then
+      #   PS1+='$(__git_ps1)'
+      #else
+         PS1+='$(prompt_git)'
+      #fi
    fi
-   # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #OPS1+="\[\033k\033\\\\\]"
-   OPS1+=" \$SHLVL\\$ "
-   export OPS1
+   PS1+=' $SHLVL\$ '
 }