From 322bf41ce2d2a08551ab7a7e4835ffe8a3c2a067 Mon Sep 17 00:00:00 2001 From: jimwhimpey Date: Tue, 9 Jun 2015 21:22:17 -0700 Subject: [PATCH] Simpler prompt --- themes/base.theme.bash | 18 +++++++++--------- themes/rainbowbrite/rainbowbrite.theme.bash | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 themes/base.theme.bash diff --git a/themes/base.theme.bash b/themes/base.theme.bash old mode 100644 new mode 100755 index 584fb9ce..edaead12 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -122,15 +122,15 @@ function git_prompt_vars { fi fi - local ahead_re='.+ahead ([0-9]+).+' - local behind_re='.+behind ([0-9]+).+' - [[ "${status}" =~ ${ahead_re} ]] && SCM_BRANCH+=" ${SCM_GIT_AHEAD_CHAR}${BASH_REMATCH[1]}" - [[ "${status}" =~ ${behind_re} ]] && SCM_BRANCH+=" ${SCM_GIT_BEHIND_CHAR}${BASH_REMATCH[1]}" - - local stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')" - [[ "${stash_count}" -gt 0 ]] && SCM_BRANCH+=" {${stash_count}}" - - SCM_BRANCH+=${details} + # local ahead_re='.+ahead ([0-9]+).+' + # local behind_re='.+behind ([0-9]+).+' + # [[ "${status}" =~ ${ahead_re} ]] && SCM_BRANCH+=" ${SCM_GIT_AHEAD_CHAR}${BASH_REMATCH[1]}" + # [[ "${status}" =~ ${behind_re} ]] && SCM_BRANCH+=" ${SCM_GIT_BEHIND_CHAR}${BASH_REMATCH[1]}" + # + # local stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')" + # [[ "${stash_count}" -gt 0 ]] && SCM_BRANCH+=" {${stash_count}}" + # + # SCM_BRANCH+=${details} SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX} SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX} diff --git a/themes/rainbowbrite/rainbowbrite.theme.bash b/themes/rainbowbrite/rainbowbrite.theme.bash index f156c759..68ab22db 100755 --- a/themes/rainbowbrite/rainbowbrite.theme.bash +++ b/themes/rainbowbrite/rainbowbrite.theme.bash @@ -13,7 +13,7 @@ prompt_setter() { # displays user@server in purple # PS1="$red$(scm_char) $purple\u@\h$reset_color:$blue\w$yellow$(scm_prompt_info)$(ruby_version_prompt) $black\$$reset_color " # no user@server - PS1="\n$red$(scm_char) $green\w$yellow$(scm_prompt_info) ${bold_yellow}⚡ $normal " + PS1="\n$green\w$yellow$(scm_prompt_info) ${bold_yellow}⚡ $normal " PS2='> ' PS4='+ ' }