Update Bash prompt to match the Solarized theme

Screenshot: http://i.imgur.com/EkEtphC.png

1 files changed, 110 insertions, 47 deletions

diff --git a/.bash_prompt b/.bash_prompt
index c9a821d..5322c02 100644
--- a/.bash_prompt
+++ b/.bash_prompt
@@ -1,57 +1,120 @@
-# @gf3’s Sexy Bash Prompt, inspired by “Extravagant Zsh Prompt”
-# Shamelessly copied from https://github.com/gf3/dotfiles
-# Screenshot: http://i.imgur.com/s0Blh.png
+# Shell prompt based on the Solarized Dark theme.
+# Screenshot: http://i.imgur.com/EkEtphC.png
+# Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
+# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
 
 if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
-	export TERM=gnome-256color;
+	export TERM='gnome-256color';
 elif infocmp xterm-256color >/dev/null 2>&1; then
-	export TERM=xterm-256color;
-fi
+	export TERM='xterm-256color';
+fi;
 
-if tput setaf 1 &> /dev/null; then
-	tput sgr0; # reset colors
-	if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
-		MAGENTA=$(tput setaf 9);
-		ORANGE=$(tput setaf 172);
-		GREEN=$(tput setaf 190);
-		PURPLE=$(tput setaf 141);
-		WHITE=$(tput setaf 0);
+prompt_git() {
+	local s='';
+	local branchName='';
+
+	# Check if the current directory is in a Git repository.
+	if [ $(git rev-parse --is-inside-work-tree &>/dev/null; echo "${?}") == '0' ]; then
+
+		# check if the current directory is in .git before running git checks
+		if [ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" == 'false' ]; then
+
+			# Ensure the index is up to date.
+			git update-index --really-refresh -q &>/dev/null;
+
+			# Check for uncommitted changes in the index.
+			if ! $(git diff --quiet --ignore-submodules --cached); then
+				s+='+';
+			fi;
+
+			# Check for unstaged changes.
+			if ! $(git diff-files --quiet --ignore-submodules --); then
+				s+='!';
+			fi;
+
+			# Check for untracked files.
+			if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+				s+='?';
+			fi;
+
+			# Check for stashed files.
+			if $(git rev-parse --verify refs/stash &>/dev/null); then
+				s+='$';
+			fi;
+
+		fi;
+
+		# Get the short symbolic ref.
+		# If HEAD isn’t a symbolic ref, get the short SHA for the latest commit
+		# Otherwise, just give up.
+		branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
+			git rev-parse --short HEAD 2> /dev/null || \
+			echo '(unknown)')";
+
+		[ -n "${s}" ] && s=" [${s}]";
+
+		echo "${1}${branchName}${blue}${s}";
 	else
-		MAGENTA=$(tput setaf 5);
-		ORANGE=$(tput setaf 4);
-		GREEN=$(tput setaf 2);
-		PURPLE=$(tput setaf 1);
-		WHITE=$(tput setaf 7);
+		return;
 	fi;
-	BOLD=$(tput bold);
-	RESET=$(tput sgr0);
+}
+
+if tput setaf 1 &> /dev/null; then
+	tput sgr0; # reset colors
+	bold=$(tput bold);
+	reset=$(tput sgr0);
+	# Solarized colors, taken from http://git.io/solarized-colors.
+	black=$(tput setaf 0);
+	blue=$(tput setaf 33);
+	cyan=$(tput setaf 37);
+	green=$(tput setaf 64);
+	orange=$(tput setaf 166);
+	purple=$(tput setaf 125);
+	red=$(tput setaf 124);
+	violet=$(tput setaf 61);
+	white=$(tput setaf 15);
+	yellow=$(tput setaf 136);
 else
-	MAGENTA="\033[1;31m";
-	ORANGE="\033[1;33m";
-	GREEN="\033[1;32m";
-	PURPLE="\033[1;35m";
-	WHITE="\033[1;37m";
-	BOLD="";
-	RESET="\033[m";
+	bold='';
+	reset="\e[0m";
+	black="\e[1;30m";
+	blue="\e[1;34m";
+	cyan="\e[1;36m";
+	green="\e[1;32m";
+	orange="\e[1;33m";
+	purple="\e[1;35m";
+	red="\e[1;31m";
+	violet="\e[1;35m";
+	white="\e[1;37m";
+	yellow="\e[1;33m";
 fi;
 
-export MAGENTA;
-export ORANGE;
-export GREEN;
-export PURPLE;
-export WHITE;
-export BOLD;
-export RESET;
-
-function parse_git_branch() {
-	local branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null);
-	if [ -n "${branch}" ]; then
-		[ "${branch}" == "HEAD" ] && local branch=$(git rev-parse --short HEAD 2>/dev/null);
-		local status=$(git status --porcelain 2>/dev/null);
-		echo -n " on ${PURPLE}${branch}";
-		[ -n "${status}" ] && echo -n "*";
-	fi;
-}
+# Highlight the user name when logged in as root.
+if [[ "${USER}" == "root" ]]; then
+	userStyle="\[${red}\]";
+else
+	userStyle="\[${orange}\]";
+fi;
+
+# Highlight the hostname when connected via SSH.
+if [[ "${SSH_TTY}" ]]; then
+	hostStyle="\[${bold}${red}\]";
+else
+	hostStyle="\[${yellow}\]";
+fi;
+
+# Set the terminal title to the current working directory.
+PS1="\[\033]0;\w\007\]";
+PS1+="\[${bold}\]\n"; # newline
+PS1+="\[${userStyle}\]\u"; # username
+PS1+="\[${white}\] at ";
+PS1+="\[${hostStyle}\]\h"; # host
+PS1+="\[${white}\] in ";
+PS1+="\[${green}\]\w"; # working directory
+PS1+="\$(prompt_git \"${white} on ${violet}\")"; # Git repository details
+PS1+="\n";
+PS1+="\[${white}\]\$ \[${reset}\]"; # `$` (and reset color)
+export PS1;
 
-export PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]at \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\$(parse_git_branch)\[$WHITE\]\n\$ \[$RESET\]";
-export PS2="\[$ORANGE\]→ \[$RESET\]";
+PS2="\[${yellow}\]→ \[${reset}\]";
+export PS2;