bash_prompt: Run `ls-files` from the root of the repo

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index a60560240e3d53c8e5901ee5de4450a353432077..0436df4a951bac7043a6437255c0fcd4ba5036d8 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,12 +2,13 @@ cgmem_which_prompt() {
    local _cgmem_which
    _cgmem_which="`cgmem_which 2>/dev/null`"
    if [ -n "$_cgmem_which" ]; then
-      echo "[$_cgmem_which] "
+      _cgmem_which=" $_cgmem_which"
    fi
+   echo "$_cgmem_which"
 }
 
 # Cut directories to 20% of the terminal width; add space for 3 dots
-_DIR_LENGTH=`awk "END { print int(0.2 * $COLUMNS) }" </dev/null`
+_DIR_LENGTH=`awk "END { print int(0.2 * ${COLUMNS:-80}) }" </dev/null`
 _DIR_LENGTH_DOTS=`expr $_DIR_LENGTH + 3`
 
 short_curdir() {
@@ -45,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
 
@@ -60,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
 
@@ -107,17 +108,17 @@ prompt_git() {
 
 set_prompts() {
       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
@@ -133,7 +134,7 @@ set_prompts() {
 
    PS1="\[$PS1\]"
    PS1+='${debian_chroot:+($debian_chroot)}'
-   PS1+='`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)'