Feat(bash_prompt): Show current time

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 8c3a9fe29612c4827ae1d868d0cf819395d727eb..070390260d94f449b9893ce817ad2cb13a8222fd 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() {
@@ -115,7 +116,7 @@ set_prompts() {
             PS1="\033]0;${_COMMON_PROMPT}\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
                   fi
@@ -133,7 +134,7 @@ set_prompts() {
 
    PS1="\[$PS1\]"
    PS1+='${debian_chroot:+($debian_chroot)}'
-   PS1+='`cgmem_which_prompt`\u@${HOSTNAME::5}:`short_curdir`'
+   PS1+='[\A`cgmem_which_prompt`] \u@${HOSTNAME::5}:`short_curdir`'
    if test -x /usr/bin/git >/dev/null 2>&1; then
       #if [ "`type -t __git_ps1`" = function ]; then
       #   PS1+='$(__git_ps1)'