Fix test for __git_ps1 and check for it after handling bash-completion

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index c32791c66f60ee614808aa7d0000de5867f5c3ab..73a3bbd8b3de61dcc4d3bb44c8c64deb064de495 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -34,6 +34,16 @@ case "$TERM" in
        xterm|xterm-color)
                # color terminal
 
+               # terminal attributes
+               #   0: reset / 1: bright / 2: dim / 4: underline / 5: blink /
+               #   7: reverse / 8: hidden.
+               # foreground colors
+               #   30: black / 31: red / 32: green / 33: yellow / 34: blue /
+               #   35: magenta / 36: cyan / 37: white
+               # background colors
+               #   40: black / 41: red / 42: green / 43: yellow / 44: blue /
+               #   45: magenta / 46: cyan / 47: white
+
                # colors for shell prompt etc.
                COLOR_RESET="\[\e[0m\]"
                COLOR_PREPOSTTXT="\[\e[1;37m\]"
@@ -56,15 +66,6 @@ case "$TERM" in
                export LESS_TERMCAP_us=$'\E[1;32m'
 esac
 
-# Shell prompt
-[ "$UID" -eq 0 ] \
-       && PS1="\h:\w \\\$ " \
-       || PS1="\u@\h:\w \\\$ "
-if [ "\$(type -t __git_ps1)" ]; then
-       PS1="\$(__git_ps1 '(%s) ')$PS1"
-fi
-PS1="${chroot_name:+[$chroot_name] }$PS1"
-
 # Enable bash completion, if available
 [ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
        && source /etc/bash_completion
@@ -73,6 +74,27 @@ PS1="${chroot_name:+[$chroot_name] }$PS1"
 [ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
        && source /opt/local/etc/bash_completion
 
+# Shell prompt
+PS1_Path() {
+       P="${PWD/$HOME/~}"
+       echo "${P/???????????????????????????????*/${P:0:8}...${P: -20}}"
+}
+
+PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
+[ "$UID" -eq 0 ] \
+       || PS1="${PS1}${COLOR_USER}\u${COLOR_AT}@"
+PS1="${PS1}${COLOR_HOST}\h"
+PS1="${PS1}${COLOR_COLON}:"
+PS1="${PS1}${COLOR_PATH}\$(PS1_Path)"
+PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
+[ "$UID" -eq 0 ] \
+       && PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
+       || PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
+[ "$(type -t __git_ps1)" ] \
+       && PS1="\$(__git_ps1 '(${COLOR_VCS}%s${COLOR_RESET}) ')${PS1}"
+PS1="${chroot_name:+[${COLOR_CHROOT}$chroot_name${COLOR_RESET}] }${PS1}"
+PS1="${COLOR_RESET}${PS1}"
+
 # If the command-not-found package is installed, use it
 if [ -r /etc/bash_command_not_found ]; then
        . /etc/bash_command_not_found