X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=14e6dc28af5bc2889e787b04927b6b943ba85247;hb=d6c7211aacb7874045ed3d84fddaed874397208a;hp=8c3a9fe29612c4827ae1d868d0cf819395d727eb;hpb=e507d6e0c73bef06385da3bc457c72a86e2e8100;p=dotfiles.git diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt index 8c3a9fe..14e6dc2 100644 --- a/admin/prog/bash_prompt +++ b/admin/prog/bash_prompt @@ -2,12 +2,24 @@ 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) }" /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 +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 @@ -105,19 +117,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\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 @@ -133,7 +145,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)'