X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=903a58b8bbaefd02d04a141006f268d7619307b7;hb=HEAD;hp=14543705585b52f6ed8d8de2f54a1d0cd7466c5c;hpb=44bc3c3f9a5cdaddf8bad3f0c87e2237bbbb03c6;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 1454370..903a58b 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,8 +2,20 @@ 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
@@ -31,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=""
@@ -45,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
 
@@ -105,27 +127,23 @@ prompt_git() {
 #   fi
 #fi
 
-set_prompts() {
+set_prompt() {
       PS1=''
-      local _COMMON_PROMPT='${debian_chroot:+($debian_chroot)}\u@\h:\w'
+      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)
-            PS1="\033]0;${_COMMON_PROMPT}\007" # Set xterm title/icon
+            PS1+="\033]0;${debian_chroot:+($debian_chroot)}\u@\h:\w\007" # Set xterm title/icon
             case "$TERM" in
                screen*)
-                  PS1="\033P${PS1}\033\\\\" # Set xterm title/icon under screen/tmux
+                  PS1+="\033P${PS1}\033\\\\" # Set xterm title/icon under screen/tmux
                   if [ -z "$MC_SID" ]; then
-                     PS1+="\033k${_COMMON_PROMPT}\033\\\\" # Set screen/tmux caption
+                     PS1+="\033k${_SHORT_PROMPT}\033\\\\" # Set screen/tmux caption
                   fi
                ;;
             esac
          ;;
-
-         *)
-            PS1=""
-         ;;
       esac
 
    # This is for .screenrc: shelltitle "\$ |$SHELL"
@@ -133,7 +151,7 @@ set_prompts() {
 
    PS1="\[$PS1\]"
    PS1+='${debian_chroot:+($debian_chroot)}'
-   PS1+='`cgmem_which_prompt`\u@${HOSTNAME::5}:`short_curdir`'
+   PS1+=${_SHORT_PROMPT}
    if test -x /usr/bin/git >/dev/null 2>&1; then
       #if [ "`type -t __git_ps1`" = function ]; then
       #   PS1+='$(__git_ps1)'