bashrc: sane vcs naming

Author: Artoria2e5

bashrc

@@ -77,8 +77,8 @@ _ret_same() { return $?; }
 # Base functions ready. Let's load bashrc.d.
 for c in /etc/bashrc.d/*; do . $c; done 
 
-# The prompt depends on repo_status! Get one backup anyway.
-declare -f _repo_status >/dev/null || ! echo _repo_status not declared, making stub.. || alias _repo_status=_ret_same
+# The prompt depends on vcs_status! Get one backup anyway.
+declare -f _vcs_status >/dev/null || ! echo _vcs_status not declared, making stub.. || alias _vcs_status=_ret_same
 
 # To be shipped together. See comments in bashrc_repo on _ret and _ret_status().
 
@@ -87,9 +87,9 @@ declare -f _repo_status >/dev/null || ! echo _repo_status not declared, making s
 # Well, forget it.
 
 if [[ "$EUID" == 0 ]] ; then
-  PS1="$RED\u $NORMAL[ \W\$(_repo_status) ]$RED \$(_ret_prompt) $NORMAL"
+  PS1="$RED\u $NORMAL[ \W\$(_vcs_status) ]$RED \$(_ret_prompt) $NORMAL"
 else
-  PS1="$GREEN\u $NORMAL[ \W\$(_repo_status) ]$GREEN \$(_ret_prompt) $NORMAL"
+  PS1="$GREEN\u $NORMAL[ \W\$(_vcs_status) ]$GREEN \$(_ret_prompt) $NORMAL"
 fi
 
 # Completion, wow.

bashrc.d/.bashrc_git renamed to bashrc.d/.vcs_git

@@ -0,0 +1,32 @@
+# 20-vcs, the version control display for AOSC OSes PS1.
+# by Arthur Wang
+
+# This module is highly extensible. Just read the source.
+# Long-term TODO: svn, vns and bzr.
+
+# We are not POSIX-compatible.
+_is_posix && return
+
+# Get functions
+_vcs_files="$(echo /etc/bashrc.d/.vcs_*)"
+if [ "$_vcs_files" == "/etc/bashrc.d/.vcs_*" ]; then
+	_vcs_status(){ true; }
+	unset _vcs_files
+	return
+else
+    for _vcs in $_vcs_files; do
+		. "$_vcs"
+		_vcs_mods+=" ${_vcs/\/etc\/bashrc.d\/.vcs_}"
+	done
+fi
+unset _vcs _vcs_files
+
+# Output
+_vcs_status() {
+	_ret=$?
+	local _vcs
+	for _vcs in $_vcs_mods; do
+		"$_vcs"_status && break
+	done
+	return $_ret
+}