.shellrc: Do not reset `PS1`

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index dc6f2935545b54d29213ac6850af837d59211a18..e4b3563b613ae78588eda1068b25cdc064a3dee8 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -7,6 +7,17 @@ cgmem_which_prompt() {
    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
 _DIR_LENGTH=`awk "END { print int(0.2 * ${COLUMNS:-80}) }" </dev/null`
 _DIR_LENGTH_DOTS=`expr $_DIR_LENGTH + 3`
@@ -46,7 +57,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 +72,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,27 +117,23 @@ prompt_git() {
 #   fi
 #fi
 
-set_prompts() {
+set_prompt() {
       PS1=''
       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;${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"