Merge branch 'simple'

Author: Artoria2e5

bashrc

@@ -56,16 +56,16 @@ _ret_prompt() {
 }
 
 _ret_same() { return $?; }
-. /etc/bashrc_repo &>/dev/null || alias _repo_status='_ret_same' # Fallback
+. /etc/bashrc_repo &>/dev/null || alias _git_branch='_ret_same' # Fallback
 # To be shipped together. See comments in bashrc_repo on _ret and _ret_status().
 
 # Use "\w" if you want the script to display full path
 # How about using cut to "\w($PWD)" to give path of a certain depth?
   # Well, forget it.
 if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u $NORMAL[ \W\$(_repo_status) ]$RED \$(_ret_prompt) $NORMAL"
+  PS1="$RED\u $NORMAL[ \W\$(_git_branch) ]$RED \$(_ret_prompt) $NORMAL"
 else
-  PS1="$GREEN\u $NORMAL[ \W\$(_repo_status) ]$GREEN \$(_ret_prompt) $NORMAL"
+  PS1="$GREEN\u $NORMAL[ \W\$(_git_branch) ]$GREEN \$(_ret_prompt) $NORMAL"
 fi
 
 # Extra Aliases for those lazy ones :)

bashrc_git

@@ -34,15 +34,16 @@ alias __git_branch="git branch 2>/dev/null | grep '*' | sed 's/*\ //g'"
 # From http://mediadoneright.com/content/ultimate-git-ps1-bash-prompt
 # Modified.
 _git_branch() {
+  _ret=$?
   if (git branch &>/dev/null) 
   then if (LANG=C git status | grep "nothing to commit" &>/dev/null)
       then printf "\e[1m@\e[0;32m$(__git_branch)\e[0m"
       elif (LANG=C git status | grep "nothing added to commit" &>/dev/null) # Untracked
         then printf "\e[1m@\e[0;35m$(__git_branch)\e[0m"
       else printf "\e[1m@$IRED$(__git_branch)\e[0m" # Change not added/not merged yet
     fi
-    else false # Necessary, read bashrc_repo.
   fi
+  return $_ret
 }