akomakom · September 19, 2018 18:15 · Sep 19, 2018 · Sep 19, 2018 · Sep 19, 2018 · Sep 19, 2018
diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -23,6 +23,12 @@
 #   http://gist.github.com/31967
 #
 #   mcheck:     Added rvm ruby version, adjusted regex for git > 1.8.5 clean status output 
+#	
+# akom: made rvm options	
+# akom: modified colors	
+# akom: made compatible with newer git status	
+# akom: added a few more git states
+# akom: added 'history -a'
 
 
 # The various escape codes that we can use to color our prompt.

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -23,11 +23,6 @@
 #   http://gist.github.com/31967
 #
 #   mcheck:     Added rvm ruby version, adjusted regex for git > 1.8.5 clean status output 
-#
-# akom: made rvm options
-# akom: modified colors
-# akom: made compatible with newer git status
-# akom: added 'history -a'
 
 
 # The various escape codes that we can use to color our prompt.
@@ -154,3 +149,4 @@ function set_bash_prompt () {
 
 # Tell bash to execute this function just before displaying its prompt.
 PROMPT_COMMAND=set_bash_prompt
+
diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -27,6 +27,7 @@
 # akom: made rvm options
 # akom: modified colors
 # akom: made compatible with newer git status
+# akom: added 'history -a'
 
 
 # The various escape codes that we can use to color our prompt.

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -21,13 +21,20 @@
 #   Based on work by halbtuerke and lakiolen.
 #
 #   http://gist.github.com/31967
+#
+#   mcheck:     Added rvm ruby version, adjusted regex for git > 1.8.5 clean status output 
+#
+# akom: made rvm options
+# akom: modified colors
+# akom: made compatible with newer git status
 
 
 # The various escape codes that we can use to color our prompt.
         RED="\[\033[0;31m\]"
      YELLOW="\[\033[0;33m\]"
       GREEN="\[\033[0;32m\]"
        BLUE="\[\033[0;34m\]"
+ LIGHT_BLUE="\[\033[1;94m\]"
   LIGHT_RED="\[\033[1;31m\]"
 LIGHT_GREEN="\[\033[1;32m\]"
       WHITE="\[\033[1;37m\]"
@@ -47,19 +54,21 @@ function is_svn_repository {
 # Determine the branch/state information for this git repository.
 function set_git_branch {
   # Capture the output of the "git status" command.
-  git_status="$(git status 2> /dev/null)"
+  git_status="$(git status -s 2> /dev/null)"
+  local code=$?
 
   # Set color based on clean/staged/dirty.
-  if [[ ${git_status} =~ "working directory clean" ]]; then
+  if [[ ${git_status} == "" ]]; then
     state="${GREEN}"
-  elif [[ ${git_status} =~ "Changes to be committed" ]]; then
+  else 
     state="${YELLOW}"
-  else
+  fi
+  if [[ ! $code -eq 0 ]] ; then
     state="${RED}"
   fi
 
   # Set arrow icon based on status against remote.
-  remote_pattern="# Your branch is (.*) of"
+  remote_pattern="[# ]*Your branch is (.*) of"
   if [[ ${git_status} =~ ${remote_pattern} ]]; then
     if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
       remote="↑"
@@ -69,13 +78,13 @@ function set_git_branch {
   else
     remote=""
   fi
-  diverge_pattern="# Your branch and (.*) have diverged"
+  diverge_pattern="[# ]*Your branch and (.*) have diverged"
   if [[ ${git_status} =~ ${diverge_pattern} ]]; then
     remote="↕"
   fi
 
   # Get the name of the branch.
-  branch_pattern="^# On branch ([^${IFS}]*)"    
+  branch_pattern="^[# ]*On branch ([^${IFS}]*)"    
   if [[ ${git_status} =~ ${branch_pattern} ]]; then
     branch=${BASH_REMATCH[1]}
   fi
@@ -113,6 +122,11 @@ function set_prompt_symbol () {
   fi
 }
 
+function parse_ruby_version {
+  # ruby -v | cut -d" " -f2    # Pull ruby version from ruby
+  [ -x ~/.rvm/bin/rvm-prompt ] && echo "($(~/.rvm/bin/rvm-prompt v p g))"  # Pull ruby and gemset from rvm, check the command to format the response differently
+}
+
 # Set the full bash prompt.
 function set_bash_prompt () {
   # Set the PROMPT_SYMBOL variable. We do this first so we don't lose the 
@@ -128,8 +142,13 @@ function set_bash_prompt () {
     BRANCH=''
   fi
 
+
   # Set the bash prompt variable.
-  PS1="\u@\h \w ${BRANCH}${PROMPT_SYMBOL} "
+  # AKOM: added colors
+  PS1="${GREEN}\u@\h${COLOR_NONE}:${LIGHT_BLUE}\W${COLOR_NONE} $(parse_ruby_version)${BRANCH}${PROMPT_SYMBOL} "
+
+  # AKOM:
+  history -a # save this shell's history now
 }
 
 # Tell bash to execute this function just before displaying its prompt.

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -66,6 +66,8 @@ function set_git_branch {
     else
       remote="↓"
     fi
+  else
+    remote=""
   fi
   diverge_pattern="# Your branch and (.*) have diverged"
   if [[ ${git_status} =~ ${diverge_pattern} ]]; then

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -82,7 +82,8 @@ function set_git_branch {
   BRANCH="${state}(${branch})${remote}${COLOR_NONE} "
 }
 
-# Determine the branch information for this subversion repository.
+# Determine the branch information for this subversion repository. No support
+# for svn status, since that needs to hit the remote repository.
 function set_svn_branch {
   # Capture the output of the "git status" command.
   svn_info="$(svn info | egrep '^URL: ' 2> /dev/null)"

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -18,6 +18,8 @@
 #   Scott Woods <scott@westarete.com>
 #   West Arete Computing
 #
+#   Based on work by halbtuerke and lakiolen.
+#
 #   http://gist.github.com/31967
 
 

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -1,14 +1,25 @@
 #!/bin/bash
 #
-# Set our bash prompt according to:
-#  * the branch/status of the current git repository
-#  * the branch of the current subversion repository
-#  * the return value of the previous command
+# DESCRIPTION:
+#
+#   Set the bash prompt according to:
+#    * the branch/status of the current git repository
+#    * the branch of the current subversion repository
+#    * the return value of the previous command
 # 
-# http://gist.github.com/31967
+# USAGE:
+#
+#   1. Save this file as ~/.git_svn_bash_prompt
+#   2. Add the following line to the end of your ~/.profile or ~/.bash_profile:
+#        . ~/.git_svn_bash_prompt
 #
-# Scott Woods <scott@westarete.com>
-# West Arete Computing
+# AUTHOR:
+# 
+#   Scott Woods <scott@westarete.com>
+#   West Arete Computing
+#
+#   http://gist.github.com/31967
+
 
 # The various escape codes that we can use to color our prompt.
         RED="\[\033[0;31m\]"

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -5,7 +5,7 @@
 #  * the branch of the current subversion repository
 #  * the return value of the previous command
 # 
-# Originally based on http://gist.github.com/31934
+# http://gist.github.com/31967
 #
 # Scott Woods <scott@westarete.com>
 # West Arete Computing

diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -32,7 +32,7 @@ function is_svn_repository {
 }
 
 # Determine the branch/state information for this git repository.
-function parse_git_branch {
+function set_git_branch {
   # Capture the output of the "git status" command.
   git_status="$(git status 2> /dev/null)"
 
@@ -65,12 +65,12 @@ function parse_git_branch {
     branch=${BASH_REMATCH[1]}
   fi
 
-  # Return the prompt.
-  echo "${state}(${branch})${remote}${COLOR_NONE} "
+  # Set the final branch string.
+  BRANCH="${state}(${branch})${remote}${COLOR_NONE} "
 }
 
 # Determine the branch information for this subversion repository.
-function parse_svn_branch {
+function set_svn_branch {
   # Capture the output of the "git status" command.
   svn_info="$(svn info | egrep '^URL: ' 2> /dev/null)"
 
@@ -83,31 +83,38 @@ function parse_svn_branch {
     branch='trunk'
   fi
 
-  # Return the prompt.
-  echo "(${branch}) "
+  # Set the final branch string.
+  BRANCH="(${branch}) "
 }
 
 # Return the prompt symbol to use, colorized based on the return value of the
 # previous command.
-function prompt_symbol () {
+function set_prompt_symbol () {
   if test $1 -eq 0 ; then
-      echo "\$"
+      PROMPT_SYMBOL="\$"
   else
-      echo "${RED}\$${COLOR_NONE}"
+      PROMPT_SYMBOL="${RED}\$${COLOR_NONE}"
   fi
 }
 
-# Set the full prompt.
-function prompt_func () {
-  last_return_value=$?
+# Set the full bash prompt.
+function set_bash_prompt () {
+  # Set the PROMPT_SYMBOL variable. We do this first so we don't lose the 
+  # return value of the last command.
+  set_prompt_symbol $?
+
+  # Set the BRANCH variable.
   if is_git_repository ; then
-    branch="$(parse_git_branch)"
+    set_git_branch
   elif is_svn_repository ; then
-    branch="$(parse_svn_branch)"
+    set_svn_branch
   else
-    branch=''
+    BRANCH=''
   fi
-  PS1="\u@\h \w $branch$(prompt_symbol $last_return_value) "
+
+  # Set the bash prompt variable.
+  PS1="\u@\h \w ${BRANCH}${PROMPT_SYMBOL} "
 }
 
-PROMPT_COMMAND=prompt_func
+# Tell bash to execute this function just before displaying its prompt.
+PROMPT_COMMAND=set_bash_prompt
diff --git a/git_svn_bash_prompt.sh b/git_svn_bash_prompt.sh
@@ -1,77 +1,113 @@
-#!/bin/bash
-#
-# Set our bash prompt according to the branch/status of the current git 
-# repository.
-#
-# Forked from http://gist.github.com/31934
-
-        RED="\[\033[0;31m\]"
-     YELLOW="\[\033[0;33m\]"
-      GREEN="\[\033[0;32m\]"
-       BLUE="\[\033[0;34m\]"
-  LIGHT_RED="\[\033[1;31m\]"
-LIGHT_GREEN="\[\033[1;32m\]"
-      WHITE="\[\033[1;37m\]"
- LIGHT_GRAY="\[\033[0;37m\]"
- COLOR_NONE="\[\e[0m\]"
-
-function is_git_repository {
-  git branch > /dev/null 2>&1
-}
-
-function parse_git_branch {
-  # Only display git info if we're inside a git repository.
-  is_git_repository || return 1
-
-  # Capture the output of the "git status" command.
-  git_status="$(git status 2> /dev/null)"
-
-  # Set color based on clean/staged/dirty.
-  if [[ ${git_status} =~ "working directory clean" ]]; then
-    state="${GREEN}"
-  elif [[ ${git_status} =~ "Changes to be committed" ]]; then
-    state="${YELLOW}"
-  else
-    state="${RED}"
-  fi
-
-  # Set arrow icon based on status against remote.
-  remote_pattern="# Your branch is (.*) of"
-  if [[ ${git_status} =~ ${remote_pattern} ]]; then
-    if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
-      remote="↑"
-    else
-      remote="↓"
-    fi
-  fi
-  diverge_pattern="# Your branch and (.*) have diverged"
-  if [[ ${git_status} =~ ${diverge_pattern} ]]; then
-    remote="↕"
-  fi
-
-  # Get the name of the branch.
-  branch_pattern="^# On branch ([^${IFS}]*)"    
-  if [[ ${git_status} =~ ${branch_pattern} ]]; then
-    branch=${BASH_REMATCH[1]}
-  fi
-
-  # Display the prompt.
-  echo "${state}(${branch})${remote}${COLOR_NONE} "
-}
-
-function prompt_symbol () {
-  # Set color of dollar prompt based on return value of previous command.
-  if test $1 -eq 0
-  then
-      echo "\$"
-  else
-      echo "${RED}\$${COLOR_NONE}"
-  fi
-}
-
-function prompt_func () {
-  last_return_value=$?
-  PS1="\u@\h \w $(parse_git_branch)$(prompt_symbol $last_return_value) "
-}
-
+#!/bin/bash
+#
+# Set our bash prompt according to:
+#  * the branch/status of the current git repository
+#  * the branch of the current subversion repository
+#  * the return value of the previous command
+# 
+# Originally based on http://gist.github.com/31934
+#
+# Scott Woods <scott@westarete.com>
+# West Arete Computing
+
+# The various escape codes that we can use to color our prompt.
+        RED="\[\033[0;31m\]"
+     YELLOW="\[\033[0;33m\]"
+      GREEN="\[\033[0;32m\]"
+       BLUE="\[\033[0;34m\]"
+  LIGHT_RED="\[\033[1;31m\]"
+LIGHT_GREEN="\[\033[1;32m\]"
+      WHITE="\[\033[1;37m\]"
+ LIGHT_GRAY="\[\033[0;37m\]"
+ COLOR_NONE="\[\e[0m\]"
+
+# Detect whether the current directory is a git repository.
+function is_git_repository {
+  git branch > /dev/null 2>&1
+}
+
+# Detect whether the current directory is a subversion repository.
+function is_svn_repository {
+  test -d .svn
+}
+
+# Determine the branch/state information for this git repository.
+function parse_git_branch {
+  # Capture the output of the "git status" command.
+  git_status="$(git status 2> /dev/null)"
+
+  # Set color based on clean/staged/dirty.
+  if [[ ${git_status} =~ "working directory clean" ]]; then
+    state="${GREEN}"
+  elif [[ ${git_status} =~ "Changes to be committed" ]]; then
+    state="${YELLOW}"
+  else
+    state="${RED}"
+  fi
+
+  # Set arrow icon based on status against remote.
+  remote_pattern="# Your branch is (.*) of"
+  if [[ ${git_status} =~ ${remote_pattern} ]]; then
+    if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
+      remote="↑"
+    else
+      remote="↓"
+    fi
+  fi
+  diverge_pattern="# Your branch and (.*) have diverged"
+  if [[ ${git_status} =~ ${diverge_pattern} ]]; then
+    remote="↕"
+  fi
+
+  # Get the name of the branch.
+  branch_pattern="^# On branch ([^${IFS}]*)"    
+  if [[ ${git_status} =~ ${branch_pattern} ]]; then
+    branch=${BASH_REMATCH[1]}
+  fi
+
+  # Return the prompt.
+  echo "${state}(${branch})${remote}${COLOR_NONE} "
+}
+
+# Determine the branch information for this subversion repository.
+function parse_svn_branch {
+  # Capture the output of the "git status" command.
+  svn_info="$(svn info | egrep '^URL: ' 2> /dev/null)"
+
+  # Get the name of the branch.
+  branch_pattern="^URL: .*/(branches|tags)/([^/]+)"
+  trunk_pattern="^URL: .*/trunk(/.*)?$"
+  if [[ ${svn_info} =~ $branch_pattern ]]; then
+    branch=${BASH_REMATCH[2]}
+  elif [[ ${svn_info} =~ $trunk_pattern ]]; then
+    branch='trunk'
+  fi
+
+  # Return the prompt.
+  echo "(${branch}) "
+}
+
+# Return the prompt symbol to use, colorized based on the return value of the
+# previous command.
+function prompt_symbol () {
+  if test $1 -eq 0 ; then
+      echo "\$"
+  else
+      echo "${RED}\$${COLOR_NONE}"
+  fi
+}
+
+# Set the full prompt.
+function prompt_func () {
+  last_return_value=$?
+  if is_git_repository ; then
+    branch="$(parse_git_branch)"
+  elif is_svn_repository ; then
+    branch="$(parse_svn_branch)"
+  else
+    branch=''
+  fi
+  PS1="\u@\h \w $branch$(prompt_symbol $last_return_value) "
+}
+
 PROMPT_COMMAND=prompt_func
diff --git a/gistfile1.sh → git_svn_bash_prompt.sh b/gistfile1.sh → git_svn_bash_prompt.sh
diff --git a/gistfile1.sh b/gistfile1.sh
@@ -3,7 +3,7 @@
 # Set our bash prompt according to the branch/status of the current git 
 # repository.
 #
-# Taken from http://gist.github.com/31934
+# Forked from http://gist.github.com/31934
 
         RED="\[\033[0;31m\]"
      YELLOW="\[\033[0;33m\]"
@@ -20,33 +20,43 @@ function is_git_repository {
 }
 
 function parse_git_branch {
+  # Only display git info if we're inside a git repository.
   is_git_repository || return 1
+
+  # Capture the output of the "git status" command.
   git_status="$(git status 2> /dev/null)"
-  branch_pattern="^# On branch ([^${IFS}]*)"
-  remote_pattern="# Your branch is (.*) of"
-  diverge_pattern="# Your branch and (.*) have diverged"
+
+  # Set color based on clean/staged/dirty.
   if [[ ${git_status} =~ "working directory clean" ]]; then
     state="${GREEN}"
-  elif [[ ${git_status} =~ "Untracked files" ]]; then
-    state="${RED}"
-  else
+  elif [[ ${git_status} =~ "Changes to be committed" ]]; then
     state="${YELLOW}"
+  else
+    state="${RED}"
   fi
-  # add an else if or two here if you want to get more specific
+
+  # Set arrow icon based on status against remote.
+  remote_pattern="# Your branch is (.*) of"
   if [[ ${git_status} =~ ${remote_pattern} ]]; then
     if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
       remote="↑"
     else
       remote="↓"
     fi
   fi
+  diverge_pattern="# Your branch and (.*) have diverged"
   if [[ ${git_status} =~ ${diverge_pattern} ]]; then
     remote="↕"
   fi
+
+  # Get the name of the branch.
+  branch_pattern="^# On branch ([^${IFS}]*)"    
   if [[ ${git_status} =~ ${branch_pattern} ]]; then
     branch=${BASH_REMATCH[1]}
-    echo "${state}(${branch})${remote}${COLOR_NONE} "
   fi
+
+  # Display the prompt.
+  echo "${state}(${branch})${remote}${COLOR_NONE} "
 }
 
 function prompt_symbol () {

diff --git a/gistfile1.sh b/gistfile1.sh
@@ -1,50 +1,67 @@
+#!/bin/bash
+#
+# Set our bash prompt according to the branch/status of the current git 
+# repository.
+#
+# Taken from http://gist.github.com/31934
+
         RED="\[\033[0;31m\]"
      YELLOW="\[\033[0;33m\]"
- 	  GREEN="\[\033[0;32m\]"
+      GREEN="\[\033[0;32m\]"
        BLUE="\[\033[0;34m\]"
   LIGHT_RED="\[\033[1;31m\]"
 LIGHT_GREEN="\[\033[1;32m\]"
       WHITE="\[\033[1;37m\]"
  LIGHT_GRAY="\[\033[0;37m\]"
  COLOR_NONE="\[\e[0m\]"
 
-function parse_git_branch {
+function is_git_repository {
+  git branch > /dev/null 2>&1
+}
 
-  [ -d .git ] || return 1
+function parse_git_branch {
+  is_git_repository || return 1
   git_status="$(git status 2> /dev/null)"
   branch_pattern="^# On branch ([^${IFS}]*)"
   remote_pattern="# Your branch is (.*) of"
   diverge_pattern="# Your branch and (.*) have diverged"
-  if [[ ! ${git_status}} =~ "working directory clean" ]]; then
-    state="${RED}⚡"
+  if [[ ${git_status} =~ "working directory clean" ]]; then
+    state="${GREEN}"
+  elif [[ ${git_status} =~ "Untracked files" ]]; then
+    state="${RED}"
+  else
+    state="${YELLOW}"
   fi
   # add an else if or two here if you want to get more specific
   if [[ ${git_status} =~ ${remote_pattern} ]]; then
     if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
-      remote="${YELLOW}↑"
+      remote="↑"
     else
-      remote="${YELLOW}↓"
+      remote="↓"
     fi
   fi
   if [[ ${git_status} =~ ${diverge_pattern} ]]; then
-    remote="${YELLOW}↕"
+    remote="↕"
   fi
   if [[ ${git_status} =~ ${branch_pattern} ]]; then
     branch=${BASH_REMATCH[1]}
-    echo " (${branch})${remote}${state}"
+    echo "${state}(${branch})${remote}${COLOR_NONE} "
   fi
 }
 
-function prompt_func() {
-    previous_return_value=$?;
-    # prompt="${TITLEBAR}$BLUE[$RED\w$GREEN$(__git_ps1)$YELLOW$(git_dirty_flag)$BLUE]$COLOR_NONE "
-    prompt="${TITLEBAR}${BLUE}[${RED}\w${GREEN}$(parse_git_branch)${BLUE}]${COLOR_NONE} "
-    if test $previous_return_value -eq 0
-    then
-        PS1="${prompt}➔ "
-    else
-        PS1="${prompt}${RED}➔${COLOR_NONE} "
-    fi
+function prompt_symbol () {
+  # Set color of dollar prompt based on return value of previous command.
+  if test $1 -eq 0
+  then
+      echo "\$"
+  else
+      echo "${RED}\$${COLOR_NONE}"
+  fi
+}
+
+function prompt_func () {
+  last_return_value=$?
+  PS1="\u@\h \w $(parse_git_branch)$(prompt_symbol $last_return_value) "
 }
 
 PROMPT_COMMAND=prompt_func
diff --git a/gistfile1.sh b/gistfile1.sh
@@ -1,25 +1,50 @@
+        RED="\[\033[0;31m\]"
+     YELLOW="\[\033[0;33m\]"
+ 	  GREEN="\[\033[0;32m\]"
+       BLUE="\[\033[0;34m\]"
+  LIGHT_RED="\[\033[1;31m\]"
+LIGHT_GREEN="\[\033[1;32m\]"
+      WHITE="\[\033[1;37m\]"
+ LIGHT_GRAY="\[\033[0;37m\]"
+ COLOR_NONE="\[\e[0m\]"
+
 function parse_git_branch {
+
   [ -d .git ] || return 1
   git_status="$(git status 2> /dev/null)"
   branch_pattern="^# On branch ([^${IFS}]*)"
   remote_pattern="# Your branch is (.*) of"
   diverge_pattern="# Your branch and (.*) have diverged"
   if [[ ! ${git_status}} =~ "working directory clean" ]]; then
-    state="*"
+    state="${RED}⚡"
   fi
   # add an else if or two here if you want to get more specific
   if [[ ${git_status} =~ ${remote_pattern} ]]; then
     if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
-      remote="↑"
+      remote="${YELLOW}↑"
     else
-      remote="↓"
+      remote="${YELLOW}↓"
     fi
   fi
   if [[ ${git_status} =~ ${diverge_pattern} ]]; then
-    remote="↕"
+    remote="${YELLOW}↕"
   fi
   if [[ ${git_status} =~ ${branch_pattern} ]]; then
     branch=${BASH_REMATCH[1]}
-    echo " <${branch}${state}${remote}>"
+    echo " (${branch})${remote}${state}"
   fi
-}
+}
+
+function prompt_func() {
+    previous_return_value=$?;
+    # prompt="${TITLEBAR}$BLUE[$RED\w$GREEN$(__git_ps1)$YELLOW$(git_dirty_flag)$BLUE]$COLOR_NONE "
+    prompt="${TITLEBAR}${BLUE}[${RED}\w${GREEN}$(parse_git_branch)${BLUE}]${COLOR_NONE} "
+    if test $previous_return_value -eq 0
+    then
+        PS1="${prompt}➔ "
+    else
+        PS1="${prompt}${RED}➔${COLOR_NONE} "
+    fi
+}
+
+PROMPT_COMMAND=prompt_func
diff --git a/gistfile1.sh b/gistfile1.sh
@@ -1,13 +1,25 @@
 function parse_git_branch {
+  [ -d .git ] || return 1
   git_status="$(git status 2> /dev/null)"
-  pattern="^# On branch ([^${IFS}]*)"
+  branch_pattern="^# On branch ([^${IFS}]*)"
+  remote_pattern="# Your branch is (.*) of"
+  diverge_pattern="# Your branch and (.*) have diverged"
   if [[ ! ${git_status}} =~ "working directory clean" ]]; then
     state="*"
   fi
   # add an else if or two here if you want to get more specific
-
-  if [[ ${git_status} =~ ${pattern} ]]; then
+  if [[ ${git_status} =~ ${remote_pattern} ]]; then
+    if [[ ${BASH_REMATCH[1]} == "ahead" ]]; then
+      remote="↑"
+    else
+      remote="↓"
+    fi
+  fi
+  if [[ ${git_status} =~ ${diverge_pattern} ]]; then
+    remote="↕"
+  fi
+  if [[ ${git_status} =~ ${branch_pattern} ]]; then
     branch=${BASH_REMATCH[1]}
-    echo "[${branch}${state}]"
+    echo " <${branch}${state}${remote}>"
   fi
-}
+}
diff --git a/gistfile1.txt → gistfile1.sh b/gistfile1.txt → gistfile1.sh
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,13 @@
+function parse_git_branch {
+  git_status="$(git status 2> /dev/null)"
+  pattern="^# On branch ([^${IFS}]*)"
+  if [[ ! ${git_status}} =~ "working directory clean" ]]; then
+    state="*"
+  fi
+  # add an else if or two here if you want to get more specific
+
+  if [[ ${git_status} =~ ${pattern} ]]; then
+    branch=${BASH_REMATCH[1]}
+    echo "[${branch}${state}]"
+  fi
+}
No results found