From 79a73ef4aaa0f2c5a98ec837bf198dccf7d8c90f Mon Sep 17 00:00:00 2001
From: Matt Nicholson <mnicholson@spotify.com>
Date: Thu, 17 Aug 2017 10:45:45 -0400
Subject: add ability to force rbenv being shown

---
 powerlevel9k.zsh-theme | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'powerlevel9k.zsh-theme')

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 3c34f0bb..dc2af025 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -1047,11 +1047,15 @@ prompt_rbenv() {
     local rbenv_global="$(rbenv global)"
 
     # Don't show anything if the current Ruby is the same as the global Ruby.
-    if [[ $rbenv_version_name == $rbenv_global ]]; then
-      return
+    # Unless POWERLEVEL_RBENV_ALWAYS is set.
+    set_default POWERLEVEL9K_RBENV_ALWAYS false
+    if [[ $POWERLEVEL9K_RBENV_ALWAYS == true || $rbenv_version_name != $rbenv_global ]];then
+      "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "$rbenv_version_name" 'RUBY_ICON'
+    #elif [[ $rbenv_version_name != $rbenv_global ]]; then
+    #  "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "$rbenv_version_name" 'RUBY_ICON'
+    #else
+    #  return  
     fi
-
-    "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "$rbenv_version_name" 'RUBY_ICON'
   fi
 }
 
-- 
cgit v1.2.3


From 748f9868fcf275a12359d23433191118ff690489 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Thu, 28 Sep 2017 17:27:59 -0400
Subject: Final cleanup for new POWERLEVEL9K_RBENV_ALWAYS flag

---
 powerlevel9k.zsh-theme | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'powerlevel9k.zsh-theme')

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index dc2af025..d7d99c3f 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -1041,20 +1041,16 @@ prompt_ram() {
 }
 
 # rbenv information
+set_default POWERLEVEL9K_RBENV_ALWAYS false
 prompt_rbenv() {
   if which rbenv 2>/dev/null >&2; then
     local rbenv_version_name="$(rbenv version-name)"
     local rbenv_global="$(rbenv global)"
 
-    # Don't show anything if the current Ruby is the same as the global Ruby.
-    # Unless POWERLEVEL_RBENV_ALWAYS is set.
-    set_default POWERLEVEL9K_RBENV_ALWAYS false
+    # Don't show anything if the current Ruby is the same as the global Ruby
+    # unless `POWERLEVEL9K_RBENV_ALWAYS` is set.
     if [[ $POWERLEVEL9K_RBENV_ALWAYS == true || $rbenv_version_name != $rbenv_global ]];then
       "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "$rbenv_version_name" 'RUBY_ICON'
-    #elif [[ $rbenv_version_name != $rbenv_global ]]; then
-    #  "$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "$rbenv_version_name" 'RUBY_ICON'
-    #else
-    #  return  
     fi
   fi
 }
-- 
cgit v1.2.3