Refactor(bash_prompt): Reuse `$PS1`

[dotfiles.git] / admin / prog / bash_prompt

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index 7ef5fc970ab4c8a57be04698859ab597b63368a4..a60560240e3d53c8e5901ee5de4450a353432077 100644 (file)
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -6,6 +6,10 @@ cgmem_which_prompt() {
    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`
+_DIR_LENGTH_DOTS=`expr $_DIR_LENGTH + 3`
+
 short_curdir() {
    if [ "$PWD" = / ]; then
       echo /
@@ -17,8 +21,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}"
 }
@@ -111,7 +115,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