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

diff --git a/sys/bashrc b/sys/bashrc
index 96c191808d32198251fc60ff603199931c8810ce..73a3bbd8b3de61dcc4d3bb44c8c64deb064de495 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -66,6 +66,14 @@ case "$TERM" in
                export LESS_TERMCAP_us=$'\E[1;32m'
 esac
 
+# Enable bash completion, if available
+[ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
+       && source /etc/bash_completion
+[ -z "$BASH_COMPLETION" -a -r /opt/homebrew/etc/bash_completion ] \
+       && source /opt/homebrew/etc/bash_completion
+[ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
+       && source /opt/local/etc/bash_completion
+
 # Shell prompt
 PS1_Path() {
        P="${PWD/$HOME/~}"
@@ -82,19 +90,11 @@ 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)" ] \
+[ "$(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}"
 
-# Enable bash completion, if available
-[ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
-       && source /etc/bash_completion
-[ -z "$BASH_COMPLETION" -a -r /opt/homebrew/etc/bash_completion ] \
-       && source /opt/homebrew/etc/bash_completion
-[ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
-       && source /opt/local/etc/bash_completion
-
 # If the command-not-found package is installed, use it
 if [ -r /etc/bash_command_not_found ]; then
        . /etc/bash_command_not_found