From 699818475d4848ec384ae847d6f096f5bf52e3f5 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 5 Apr 2016 12:08:36 -0400 Subject: [PATCH 1/2] new theme Solarized_UserHost This theme is based on Solarized_Extravagant, with the ruby prompt, date and kernel version removed, and user@host added on the second line. --- themes/Solarized_UserHost.bgptheme | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 themes/Solarized_UserHost.bgptheme diff --git a/themes/Solarized_UserHost.bgptheme b/themes/Solarized_UserHost.bgptheme new file mode 100644 index 0000000..4eea2f1 --- /dev/null +++ b/themes/Solarized_UserHost.bgptheme @@ -0,0 +1,23 @@ +# This theme for gitprompt.sh is optimized for the "Solarized Dark" and "Solarized Light" color schemes +# based on "Solarized Extravagant", with user@host on the second line and some things removed. + +function override_git_prompt_colors() { + GIT_PROMPT_THEME_NAME='Solarized UserHost' + GIT_PROMPT_STAGED="${Yellow}● " + GIT_PROMPT_UNTRACKED="${Cyan}… " + GIT_PROMPT_STASHED="${BoldMagenta}⚑ " + GIT_PROMPT_CLEAN="${Green}✔ " + GIT_PROMPT_COMMAND_OK="${Green}✔ " + GIT_PROMPT_COMMAND_FAIL="${Red}✘ " + + GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}" + GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}" + GIT_PROMPT_END_USER="\n${Blue}\\u${White}@${BoldBlue}\\h ${BoldRed} ➤ ${ResetColor} " + GIT_PROMPT_END_ROOT="\n${Blue}\\u${White}@${BoldBlue}\\h ${BoldRed} #️ ${ResetColor} " + GIT_PROMPT_LEADING_SPACE=1 + GIT_PROMPT_PREFIX="${Cyan}[" + GIT_PROMPT_SUFFIX="${Cyan}]" + GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="✭" +} + +reload_git_prompt_colors 'Solarized UserHost' From b3f4d82842b30fda951bc7b1cb2170a03dc5e73d Mon Sep 17 00:00:00 2001 From: Martin Gondermann Date: Sat, 9 Apr 2016 13:10:57 +0200 Subject: [PATCH 2/2] Export GIT_BRANCH as environment variable for 3rd party usage, fixes #244 --- gitprompt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitprompt.sh b/gitprompt.sh index d679acd..684217a 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -284,6 +284,7 @@ function git_prompt_config() { fi # __GIT_STATUS_CMD defined fi + unset GIT_BRANCH } function setLastCommandState() { @@ -449,7 +450,7 @@ function updatePrompt() { local -a git_status_fields git_status_fields=($("$__GIT_STATUS_CMD" 2>/dev/null)) - local GIT_BRANCH=$(replaceSymbols ${git_status_fields[0]}) + export GIT_BRANCH=$(replaceSymbols ${git_status_fields[0]}) local GIT_REMOTE="$(replaceSymbols ${git_status_fields[1]})" if [[ "." == "$GIT_REMOTE" ]]; then unset GIT_REMOTE