X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=903a58b8bbaefd02d04a141006f268d7619307b7;hb=refs%2Fheads%2Fmaster;hp=14e6dc28af5bc2889e787b04927b6b943ba85247;hpb=d6c7211aacb7874045ed3d84fddaed874397208a;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 14e6dc2..903a58b 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -43,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=""
@@ -57,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
 
@@ -124,20 +134,16 @@ set_prompt() {
       # in the terminal title
       case "$TERM" in
          *rxvt*|screen*|*term*|vt100)
-            PS1="\033]0;${debian_chroot:+($debian_chroot)}\u@\h:\w\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${_SHORT_PROMPT}\033\\\\" # Set screen/tmux caption
                   fi
                ;;
             esac
          ;;
-
-         *)
-            PS1=""
-         ;;
       esac
 
    # This is for .screenrc: shelltitle "\$ |$SHELL"