X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=e4b3563b613ae78588eda1068b25cdc064a3dee8;hb=2c9e8b23a92508c4fe13c9b43eae6274786f5aa9;hp=57ccf72b8d2a740e7c597d0d5566e1ec806559fd;hpb=88da9e6f5b863014fec5ec7cba09eb626eb51802;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 57ccf72..e4b3563 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,10 +2,26 @@ 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"
 }
 
+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`
+
 short_curdir() {
    if [ "$PWD" = / ]; then
       echo /
@@ -17,8 +33,8 @@ short_curdir() {
    fi
    local _short_curdir
    _short_curdir="${PWD##*/}" # cut all directories, get base name
-   if [ "${#_short_curdir}" -gt 18 ]; then
-      _short_curdir="${_short_curdir::15}..." # cut long string
+   if [ "${#_short_curdir}" -gt $_DIR_LENGTH_DOTS ]; then
+      _short_curdir="${_short_curdir::$_DIR_LENGTH}..." # cut long string
    fi
    echo "${_short_curdir}"
 }
@@ -41,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
 
@@ -56,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
 
@@ -101,31 +117,31 @@ 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\033]0;${_COMMON_PROMPT}\007\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${_COMMON_PROMPT}\033\\\\\]" # Set screen/tmux caption
+                     PS1+="\033k${_SHORT_PROMPT}\033\\\\" # Set screen/tmux caption
                   fi
                ;;
             esac
          ;;
-
-         *)
-            PS1=""
-         ;;
       esac
 
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #PS1+='\033k\033\\'
+
+   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)'
@@ -133,8 +149,5 @@ set_prompts() {
          PS1+='$(prompt_git)'
       #fi
    fi
-   # This is for .screenrc: shelltitle "\$ |$SHELL"
-   #PS1+='\[\033k\033\\\]'
    PS1+=' $SHLVL\$ '
-   export PS1
 }