XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for rbenv in addition to rvm 

- following existing patterns, clearing out RBENV prefix and suffix
- using existing function to read the prompt
pull/679/head
Konstantin Gredeskoul 2016-03-14 03:23:22 -07:00
parent fd37877fbf
commit 6de871294e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -23,8 +23,11 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
RVM_THEME_PROMPT_PREFIX="" RVM_THEME_PROMPT_PREFIX=""
RVM_THEME_PROMPT_SUFFIX="" RVM_THEME_PROMPT_SUFFIX=""
RVM_THEME_PROMPT_COLOR=161 RBENV_THEME_PROMPT_PREFIX=""
RVM_CHAR=${POWERLINE_RVM_CHAR:="❲r❳ "} RBENV_THEME_PROMPT_SUFFIX=""
RUBY_THEME_PROMPT_COLOR=161
RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳"}
CWD_THEME_PROMPT_COLOR=240 CWD_THEME_PROMPT_COLOR=240
@ -42,7 +45,7 @@ THEME_PROMPT_CLOCK_FORMAT=${POWERLINE_PROMPT_CLOCK_FORMAT:="%H:%M:%S"}
IN_VIM_THEME_PROMPT_COLOR=245 IN_VIM_THEME_PROMPT_COLOR=245
IN_VIM_THEME_PROMPT_TEXT="vim" IN_VIM_THEME_PROMPT_TEXT="vim"
POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv rvm cwd"} POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby cwd"}
POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"} POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
function set_rgb_color { function set_rgb_color {
@ -80,13 +83,16 @@ function __powerline_user_info_prompt {
[[ -n "${user_info}" ]] && echo "${user_info}|${color}" [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
} }
function __powerline_rvm_prompt { function __powerline_ruby_prompt {
local rvm="" local ruby_version=""
if command_exists rvm; then if command_exists rvm; then
rvm="$(rvm_version_prompt)" ruby_version="$(rvm_version_prompt)"
[[ -n "${rvm}" ]] && echo "${RVM_CHAR}${rvm}|${RVM_THEME_PROMPT_COLOR}" elif command_exists rbenv; then
ruby_version=$(rbenv_version_prompt)
fi fi
[[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
} }
function __powerline_python_venv_prompt { function __powerline_python_venv_prompt {
@ -121,7 +127,7 @@ function __powerline_scm_prompt {
if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}" scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
fi fi
echo "${scm_prompt}|${color}" echo "${scm_prompt}${scm}|${color}"
fi fi
} }