X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=dc6f2935545b54d29213ac6850af837d59211a18;hb=5ffe65c22c7d5be88defda6f282b10ddbfd2fce0;hp=14543705585b52f6ed8d8de2f54a1d0cd7466c5c;hpb=44bc3c3f9a5cdaddf8bad3f0c87e2237bbbb03c6;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 1454370..dc6f293 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -2,8 +2,9 @@ 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
@@ -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)'