bashrc{,.d}: VCS Prompt RL fixes. Fixed #8.

Author: Artoria2e5

bashrc

@@ -52,18 +52,24 @@ alias la='ls -AF'
 for c in {e,f,}grep {v,}dir ls; do alias $c="$c --color=auto"; done;
 
 # So they can be unset.
+# I need someone to help me assign those names properly.
+# Those are actually bold colors.
 _aosc_bashrc_colors='NORMAL RED GREEN CYAN IRED YELLOW'
-NORMAL=$'\\[\e[0m\\]'
-RED=$'\\[\e[1;31m\\]'
-GREEN=$'\\[\e[1;32m\\]'
-CYAN=$'\\[\e[1;36m\\]'
-
-# Linux tty color workaround
-if [[ "$TERM" == linux ]]; then # && "$(tput colors)" == 8
-	YELLOW=$'\\[\e[1;33m' IRED=$'\\[\e[0;31m\\]'
+NORMAL='\e[0m'
+RED='\e[1;31m'
+GREEN='\e[1;32m'
+CYAN='\e[1;36m'
+YELLOW='\e[1;93m'
+IRED='\e[0;91m'
+
+if _rc_term_colors="$(tput colors &>/dev/null)"; then
+	[ "$colors" -le 16 ]
 else
-	YELLOW=$'\\[\e[1;93m' IRED=$'\\[\e[0;91m\\]'
-fi
+	case "$TERM" in (linux|msys|cygwin) true;; (*) false;; esac
+fi && YELLOW='\e[1;33m' IRED='\e[0;31m'
+unset _rc_term_colors
+
+# if our TERM has no color support, then unset $_aosc_bashrc_colors
 
 # A simple error level reporting function.
 # Loaded back to PS1
@@ -95,9 +101,9 @@ type _vcs_status &>/dev/null || ! echo _vcs_status not declared, making stub.. |
 # Well, forget it.
 
 if [[ "$EUID" == 0 ]] ; then
-  PS1="$RED\u $NORMAL[ \W\$(_vcs_status) ]$RED \$(_ret_prompt) $NORMAL"
+  PS1="\[$RED\]\u \[$NORMAL\][ \W\$(_vcs_status) ]\[$RED\] \$(_ret_prompt) \[$NORMAL\]"
 else
-  PS1="$GREEN\u $NORMAL[ \W\$(_vcs_status) ]$GREEN \$(_ret_prompt) $NORMAL"
+  PS1="\[$GREEN\]\u \[$NORMAL\][ \W\$(_vcs_status) ]\[$GREEN\] \$(_ret_prompt) \[$NORMAL\]"
 fi
 
 
@@ -110,7 +116,7 @@ _is_posix || which --version | grep GNU &>/dev/null && alias which='(alias; decl
 
 # Misc stuffs
 FIGNORE='~'
-TIMEFORMAT=$'\nreal\t%3lR\t%P%%\nuser\t%3lU\nsys\t%3lS'
+TIMEFORMAT='\nreal\t%3lR\t%P%%\nuser\t%3lU\nsys\t%3lS'
 
 unset script shopt
 # End /etc/bashrc

bashrc.d/.vcs_git

@@ -33,14 +33,15 @@ alias __git_branch="git branch 2>/dev/null | grep '*' | sed 's/*\ //g'"
 _git_status() {
 	git branch &>/dev/null || return 1
 	if LC_ALL=C git status | grep -q "nothing to commit"; then 
-		 printf "\e[1m@\e[0;32m$(__git_branch)\e[0m"
+		 echo -e "\[\e[1m\]@\[\e[0;32m\]$(__git_branch)\[\e[0m\]"
 	elif LC_ALL=C git status | grep -q "nothing added to commit"; then # Untracked
-		 printf "\e[1m@\e[0;35m$(__git_branch)\e[0m"
+		 echo -e "\[\e[1m\]@\[\e[0;35m\]$(__git_branch)\[\e[0m\]"
 	else  # Change not added/not merged yet
-		 printf "\e[1m@$IRED$(__git_branch)\e[0m"
+		 echo -e "\[\e[1m\]@\[$IRED\]$(__git_branch)\[\e[0m\]"
 	fi
 }
 
-
 # A shorter one without color
 # alias _git_status='_st="$(__git_branch)"; ((!PIPESTATUS[0])) && echo "@$_st"'
+# For users of the contrib/completion __git_ps1
+# _git_status(){ git branch &>/dev/null || return 1; echo -n ' '; __git_ps1; }

bashrc.d/.vcs_hg

@@ -13,16 +13,15 @@ alias hb='hg branch'
 alias hs='hg status'
 alias ha='hg add .'
 
-# From http://mediadoneright.com/content/ultimate-hg-ps1-bash-prompt
+# From http://mediadoneright.com/content/ultimate-git-ps1-bash-prompt
 # Modified for hg.
 _hg_status() {
-  if hg branch &>/dev/null 
-    then if LC_ALL=C hg status | grep " " &>/dev/null
-      then printf "\e[1m@\e[0;32m$(hg branch)\e[0m"
-      else printf "\e[1m@$IRED$(hg branch)\e[0m"
-    fi
-    else false
-  fi
+	hg branch &>/dev/null || return 1
+	if LC_ALL=C hg status | grep -q ' '; then
+		echo -ne "@\[\e[1m\]\[\e[0;32m\]$(hg branch)\[\e[0m\]"
+	else
+		echo -ne "@\[\e[1m\]\[$IRED\]$(hg branch)\[\e[0m\]"
+	fi
 }
 
 # A shorter one without color