Merge remote-tracking branch 'upstream/master'

Author: ogr3

README.md

@@ -123,6 +123,8 @@ git clone https://github.com/ogr3/bash-git-prompt.git .bash-git-prompt
 
    # GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch
 
+   # GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10
+
    # GIT_PROMPT_START=...    # uncomment for custom prompt start sequence
    # GIT_PROMPT_END=...      # uncomment for custom prompt end sequence
 

git-prompt-help.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #  git-prompt-help -- show useful info to help new users with the information
 # being displayed.
 

gitprompt.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function async_run() {
   {

gitstatus.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -*- coding: UTF-8 -*-
 # gitstatus.sh -- produce the current git repo status on STDOUT
 # Functionally equivalent to 'gitstatus.py', but written in bash (not python).

gitstatus_pre-1.7.10.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # -*- coding: UTF-8 -*-
 # gitstatus.sh -- produce the current git repo status on STDOUT
 # Functionally equivalent to 'gitstatus.py', but written in bash (not python).

themes/Default.bgptheme

@@ -16,7 +16,6 @@ unset_git_prompt_colors() {
   unset GIT_PROMPT_CLEAN
   unset GIT_PROMPT_COMMAND_OK
   unset GIT_PROMPT_COMMAND_FAIL
-  unset GIT_PROMPT_STATUS_COMMAND
   unset GIT_PROMPT_VIRTUALENV
   unset GIT_PROMPT_UPSTREAM
   unset GIT_PROMPT_START_USER

themes/TruncatedPwd_WindowTitle.bgptheme

@@ -30,8 +30,6 @@ override_git_prompt_colors() {
     echo -n "[${PS1}]${ResetColor}"
   }
 
-  Time12a="\$(date +%H:%M)"
-
   GIT_PROMPT_START_USER="${Yellow}"
   GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
   GIT_PROMPT_END_USER=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} $ "

themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme

@@ -30,8 +30,6 @@ override_git_prompt_colors() {
     echo -n "[${PS1}]${ResetColor}"
   }
 
-  Time12a="\$(date +%H:%M)"
-
   GIT_PROMPT_START_USER="${Yellow}"
   GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
   GIT_PROMPT_END_USER="\n${White}${Time12a}${ResetColor} $ "