Cleanup of themes, adding the new upstream variables where applicable

master
oGre 10 years ago
parent 12e4de13bb
commit 62496416cd
  1. 2
      themes/Crunch.bgptheme
  2. 7
      themes/Custom.bgptemplate
  3. 3
      themes/Default.bgptheme
  4. 4
      themes/Single_line.bgptheme
  5. 9
      themes/Single_line_Solarized.bgptheme
  6. 3
      themes/Single_line_Ubuntu.bgptheme
  7. 2
      themes/Solarized_Extravagant.bgptheme

@ -21,7 +21,7 @@ override_git_prompt_colors() {
KERNEL_PROMPT='‹$(uname -r)›' KERNEL_PROMPT='‹$(uname -r)›'
GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_${White}{${Yellow}${Time12a}${White}}[${Magenta}${RUBY_PROMPT}${White}]${Cyan}${PathShort}${White}:" GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_${White}{${Yellow}${Time12a}${White}}[${Magenta}${RUBY_PROMPT}${White}]${Cyan}${PathShort}${White}:"
GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}" GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
GIT_PROMPT_END_USER="${BoldBlue} ➭ ${ResetColor}" GIT_PROMPT_END_USER="${BoldBlue} ➭ ${ResetColor}"
GIT_PROMPT_END_ROOT="${BoldRed} # ${ResetColor}" GIT_PROMPT_END_ROOT="${BoldRed} # ${ResetColor}"

@ -36,7 +36,12 @@ override_git_prompt_colors() {
## use the placeholder _VIRTUALENV_ will be replaced with ## use the placeholder _VIRTUALENV_ will be replaced with
## the name of the current virtual environment (currently CONDA and VIRTUAL_ENV) ## the name of the current virtual environment (currently CONDA and VIRTUAL_ENV)
# GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) " # GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "
# template for displaying the current remote tracking branch
# use the placeholder _UPSTREAM_ will be replaced with
# the name of the current remote tracking branch
# GIT_PROMPT_UPSTREAM=" {${Blue}_UPSTREAM_${ResetColor}}"
## _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL ## _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL
# GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}" # GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"
# GIT_PROMPT_START_ROOT="_LAST_COMMAND_INDICATOR_ ${GIT_PROMPT_START_USER}" # GIT_PROMPT_START_ROOT="_LAST_COMMAND_INDICATOR_ ${GIT_PROMPT_START_USER}"

@ -28,8 +28,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING
} }
define_helpers() define_helpers() {
{
Time12a="\$(date +%H:%M)" Time12a="\$(date +%H:%M)"
PathShort="\w"; PathShort="\w";
} }

@ -17,6 +17,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_COMMAND_OK unset GIT_PROMPT_COMMAND_OK
unset GIT_PROMPT_COMMAND_FAIL unset GIT_PROMPT_COMMAND_FAIL
unset GIT_PROMPT_VIRTUALENV unset GIT_PROMPT_VIRTUALENV
unset GIT_PROMPT_UPSTREAM
unset GIT_PROMPT_START_USER unset GIT_PROMPT_START_USER
unset GIT_PROMPT_START_ROOT unset GIT_PROMPT_START_ROOT
unset GIT_PROMPT_END_USER unset GIT_PROMPT_END_USER
@ -27,8 +28,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING
} }
define_helpers() define_helpers() {
{
Time12a="\$(date +%H:%M)" Time12a="\$(date +%H:%M)"
PathShort="\w"; PathShort="\w";
} }

@ -21,6 +21,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_COMMAND_OK unset GIT_PROMPT_COMMAND_OK
unset GIT_PROMPT_COMMAND_FAIL unset GIT_PROMPT_COMMAND_FAIL
unset GIT_PROMPT_VIRTUALENV unset GIT_PROMPT_VIRTUALENV
unset GIT_PROMPT_UPSTREAM
unset GIT_PROMPT_START_USER unset GIT_PROMPT_START_USER
unset GIT_PROMPT_START_ROOT unset GIT_PROMPT_START_ROOT
unset GIT_PROMPT_END_USER unset GIT_PROMPT_END_USER
@ -31,8 +32,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING
} }
define_helpers() define_helpers() {
{
PathShort="${BoldBlue}\u:${Cyan}\W" PathShort="${BoldBlue}\u:${Cyan}\W"
} }
@ -68,6 +68,11 @@ define_undefined_git_prompt_colors() {
# the name of the current virtual environment (currently CONDA and VIRTUAL_ENV) # the name of the current virtual environment (currently CONDA and VIRTUAL_ENV)
if [[ -z ${GIT_PROMPT_VIRTUALENV} ]]; then GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "; fi if [[ -z ${GIT_PROMPT_VIRTUALENV} ]]; then GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "; fi
# template for displaying the current remote tracking branch
# use the placeholder _UPSTREAM_ will be replaced with
# the name of the current remote tracking branch
if [[ -z ${GIT_PROMPT_UPSTREAM} ]]; then GIT_PROMPT_UPSTREAM=" {${Blue}_UPSTREAM_${ResetColor}}"; fi
# _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL # _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL
if [[ -z ${GIT_PROMPT_START_USER} ]]; then GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"; fi if [[ -z ${GIT_PROMPT_START_USER} ]]; then GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"; fi

@ -28,8 +28,7 @@ unset_git_prompt_colors() {
unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING unset GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING
} }
define_helpers() define_helpers() {
{
Time12a="\$(date +%H:%M)" Time12a="\$(date +%H:%M)"
PathShort="\w"; PathShort="\w";
} }

@ -23,7 +23,7 @@ override_git_prompt_colors() {
KERNEL_PROMPT='‹$(uname -r)›' KERNEL_PROMPT='‹$(uname -r)›'
GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${BoldBlueFg}${Time12a} ${Green}${KERNEL_PROMPT} ${Cyan}${RUBY_PROMPT} ${Yellow}${PathShort}" GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${BoldBlueFg}${Time12a} ${Green}${KERNEL_PROMPT} ${Cyan}${RUBY_PROMPT} ${Yellow}${PathShort}"
GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}" GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
if [ -n "$SSH_CLIENT" ]; then if [ -n "$SSH_CLIENT" ]; then
GIT_PROMPT_END_USER="\n${BoldRed} ➤ ${ResetColor}" GIT_PROMPT_END_USER="\n${BoldRed} ➤ ${ResetColor}"

Loading…
Cancel
Save