.shellrc: Rename `set_prompts` -> `set_prompt`

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 070390260d94f449b9893ce817ad2cb13a8222fd..0470b49b623ba2b7da3c970bb23d815aec40b967 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -46,7 +46,7 @@ prompt_git() {
             #git update-index --really-refresh -q &>/dev/null
 
             # check for unstaged changes
-            if [ -n "$(git ls-files --modified)" ]; then
+            if [ -n "$(git ls-files --modified :/)" ]; then
                 s="$s*";
             fi
 
@@ -61,7 +61,7 @@ prompt_git() {
             fi
 
             # check for untracked files
-            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+            if [ -n "$(git ls-files --others --exclude-standard :/)" ]; then
                 s="$s%";
             fi
 
@@ -106,19 +106,19 @@ 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
                   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
@@ -134,7 +134,7 @@ set_prompts() {
 
    PS1="\[$PS1\]"
    PS1+='${debian_chroot:+($debian_chroot)}'
-   PS1+='[\A`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)'