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/macovsky.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/macovsky.zsh-theme')
| -rw-r--r-- | themes/macovsky.zsh-theme | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme index d3f7d16b4..f527e5861 100644 --- a/themes/macovsky.zsh-theme +++ b/themes/macovsky.zsh-theme @@ -1,14 +1,12 @@ # ZSH Theme - Preview: https://i.gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" -if [ -e ~/.rvm/bin/rvm-prompt ]; then - PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' -else - if which rbenv &> /dev/null; then - PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' - fi -fi -RPS1="${return_code}" +PROMPT='%{$fg[green]%}%~%{$reset_color%} $(ruby_prompt_info) $(git_prompt_info)%{$reset_color%}%B$%b ' +RPROMPT="${return_code}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" + + +ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}‹" +ZSH_THEME_RUBY_PROMPT_SUFFIX="› %{$reset_color%}" |