bash_prompt: Use the same symbols as `git-prompt.sh`

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index a262e5e4bd32ce65a1a155ac9e6c7c2ff01ac0f5..889b3974b3adc53ec0457ac1dc8db967e38fc321 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -25,7 +25,7 @@ short_curdir() {
 
 # bash_prompt; adapted from
 # https://github.com/necolas/dotfiles/blob/master/shell/bash_prompt and
-# http://vitus-wagner.livejournal.com/1176589.html?thread=40146189#t40146189
+# https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
 
 prompt_git() {
     local s=""
@@ -47,12 +47,12 @@ prompt_git() {
 
             # check for unstaged changes
             if [ -n "$(git ls-files --modified)" ]; then
-                s="$s!";
+                s="$s*";
             fi
 
             # check for untracked files
             if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-                s="$s?";
+                s="$s%";
             fi
 
             # check for stashed files
@@ -97,8 +97,6 @@ set_prompts() {
    OPS1+="${debian_chroot:+($debian_chroot)}"
    OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
    OPS1+="\$(prompt_git)"
-   OPS1+="\\$"
+   OPS1+="\\$\$SHLVL "
+   export OPS1
 }
-
-#set_prompts
-#unset set_prompts