From 143cc8f90158f39d8630f26e9b0865502a467c61 Mon Sep 17 00:00:00 2001
From: Nick Diego Yamane <nick@diegoyam.com>
Date: Wed, 29 Aug 2018 15:01:10 -0400
Subject: [PATCH] Fix rvm-prompt usage in fino* themes (#6477)

* theme/fino: Check rvm-prompt is installed before to try to use it

Signed-off-by: Nick Diego Yamane <nick.diego@gmail.com>

* theme/fino-time: Check rvm-prompt is installed before to try to use it

Signed-off-by: Nick Diego Yamane <nick.diego@gmail.com>
---
 themes/fino-time.zsh-theme | 8 ++++++--
 themes/fino.zsh-theme      | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 9b1db3a08..c1a48d02a 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -25,12 +25,16 @@ function box_name {
 }
 
 
-local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+rvm_ruby=''
+if type rvm-prompt &>/dev/null; then
+    rvm_ruby='using%{$FG[243]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+fi
+
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} %D - %*
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}${rvm_ruby} %D - %*
 ╰─$(virtualenv_info)$(prompt_char) "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 6eec097f5..71ed6bbbc 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -22,10 +22,10 @@ function box_name {
 
 local ruby_env=''
 if which rvm-prompt &> /dev/null; then
-  ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}'
+  ruby_env='using%{$FG[243]%} ‹$(rvm-prompt i v g)›%{$reset_color%}'
 else
   if which rbenv &> /dev/null; then
-    ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}'
+    ruby_env='using%{$FG[243]%} ‹$(rbenv version-name)›%{$reset_color%}'
   fi
 fi
 
@@ -34,7 +34,7 @@ local git_info='$(git_prompt_info)'
 local prompt_char='$(prompt_char)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env}
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}${ruby_env}
 ╰─${prompt_char}%{$reset_color%} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"