From 59b5a5b387733b4a72510aa1c6c1090bbef3eb18 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sat, 21 Aug 2010 13:22:09 +0200
Subject: [PATCH] Fix test for __git_ps1 and check for it after handling
 bash-completion

---
 sys/bashrc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/bashrc b/sys/bashrc
index 96c1918..73a3bbd 100644
--- 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
-- 
2.39.2