diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-05-08 08:50:31 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-05-08 08:50:31 +0200 |
| commit | 76c7bd57c332b3d9231dc2c6167f3c5d3e56e110 (patch) | |
| tree | acdc36193f390e01f4144ff8feefd126b5aecd8b /themes/gnzh.zsh-theme | |
| parent | ea3e666e04bfae31b37ef42dfe54801484341e46 (diff) | |
| parent | 299cd4777a8b9da1934a1ed0c80767eea6691a70 (diff) | |
| download | zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.tar.gz zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.tar.bz2 zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.zip | |
Merge branch 'apjanke/themes-rvm-prompt-function' (#4588)
Fixes #4272
Fixes #4182
Closes #4197
Closes #4588
Diffstat (limited to 'themes/gnzh.zsh-theme')
| -rw-r--r-- | themes/gnzh.zsh-theme | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme index c763ef3c6..1e6c4e93b 100644 --- a/themes/gnzh.zsh-theme +++ b/themes/gnzh.zsh-theme @@ -29,21 +29,15 @@ local return_code="%(?..%F{red}%? ↵%f)" local user_host="${PR_USER}%F{cyan}@${PR_HOST}" local current_dir="%B%F{blue}%~%f%b" -local rvm_ruby='' -if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect user-local rvm installation - rvm_ruby='%F{red}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%f' -elif which rvm-prompt &> /dev/null; then # detect system-wide rvm installation - rvm_ruby='%F{red}‹$(rvm-prompt i v g s)›%f' -elif which rbenv &> /dev/null; then # detect Simple Ruby Version Management - rvm_ruby='%F{red}‹$(rbenv version | sed -e "s/ (set.*$//")›%f' -fi local git_branch='$(git_prompt_info)' -PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch} +PROMPT="╭─${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch} ╰─$PR_PROMPT " RPROMPT="${return_code}" ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹" ZSH_THEME_GIT_PROMPT_SUFFIX="› %f" +ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹" +ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f" } |