diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-11-06 17:20:11 -0500 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-05-08 08:45:34 +0200 |
| commit | 299cd4777a8b9da1934a1ed0c80767eea6691a70 (patch) | |
| tree | acdc36193f390e01f4144ff8feefd126b5aecd8b /themes/fino.zsh-theme | |
| parent | ea3e666e04bfae31b37ef42dfe54801484341e46 (diff) | |
| download | zsh-299cd4777a8b9da1934a1ed0c80767eea6691a70.tar.gz zsh-299cd4777a8b9da1934a1ed0c80767eea6691a70.tar.bz2 zsh-299cd4777a8b9da1934a1ed0c80767eea6691a70.zip | |
Themes: switch to using ruby_prompt_info()
Changes themes displaying RVM or other Ruby version info to use the central
ruby_prompt_info function. This supports more Ruby versioning mechanisms,
reduces copy-and-paste code, and avoids "zsh: no such file or directory: rvm-prompt"
when run on machines that do not have RVM installed.
Changes the prefix/suffix variable names to ZSH_THEME_RUBY_PROMPT_PREFIX and
ZSH_THEME_RUBY_PROMPT_SUFFIX, since they apply to all Ruby versioning mechanisms,
not just RVM.
Allows empty ZSH_THEME_RUBY_PROMPT_PREFIX and ZSH_THEME_RUBY_PROMPT_SUFFIX.
Diffstat (limited to 'themes/fino.zsh-theme')
| -rw-r--r-- | themes/fino.zsh-theme | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme index 28d6cc2ec..1d8bb30e1 100644 --- a/themes/fino.zsh-theme +++ b/themes/fino.zsh-theme @@ -20,15 +20,7 @@ function box_name { [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} } -local ruby_env='' -if which rvm-prompt &> /dev/null; then - ruby_env='using%{$FG[243]%} ‹$(rvm-prompt i v g)›%{$reset_color%}' -else - if which rbenv &> /dev/null; then - ruby_env='using%{$FG[243]%} ‹$(rbenv version-name)›%{$reset_color%}' - fi -fi - +local ruby_env='using%{$FG[243]%} $(ruby_prompt_info)' local git_info='$(git_prompt_info)' local prompt_char='$(prompt_char)' @@ -40,3 +32,5 @@ ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘" ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔" +ZSH_THEME_RUBY_PROMPT_PREFIX="‹" +ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}" |