X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=e3d491b6c20ca5eb0ed1bcea18a8d04126ee8092;hb=5251876e9b3158749e93584439916c7a68d635f2;hp=f3575b397e4d6806f7e96f89d64dc03358dd4257;hpb=9ebba9512de5b78c69bd6d134e5669ce3f17ec34;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index f3575b3..e3d491b 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -40,19 +40,14 @@ prompt_git() {
             # ensure index is up to date
             #git update-index --really-refresh -q &>/dev/null
 
-            # check for uncommitted changes in the index
-            if ! $(git diff --quiet --ignore-submodules --cached); then
-                s="$s+";
-            fi
-
             # check for unstaged changes
             if [ -n "$(git ls-files --modified)" ]; then
                 s="$s*";
             fi
 
-            # check for untracked files
-            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-                s="$s%";
+            # check for uncommitted changes in the index
+            if ! $(git diff --quiet --ignore-submodules --cached); then
+                s="$s+";
             fi
 
             # check for stashed files
@@ -60,6 +55,11 @@ prompt_git() {
                 s="$s$";
             fi
 
+            # check for untracked files
+            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+                s="$s%";
+            fi
+
         fi
 
         # get the short symbolic ref
@@ -69,7 +69,7 @@ prompt_git() {
                       git rev-parse --short HEAD 2> /dev/null || \
                       printf "(unknown)")"
 
-        [ -n "$s" ] && s=" [$s]"
+        [ -n "$s" ] && s=" $s"
         printf " (%s)" "$branchName$s"
     fi
 }
@@ -116,6 +116,8 @@ set_prompts() {
          OPS1+="\$(prompt_git)"
       fi
    fi
-   OPS1+=" \\$\$SHLVL "
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #OPS1+="\[\033k\033\\\\\]"
+   OPS1+=" \$SHLVL\\$ "
    export OPS1
 }