From 1da5fd2ed79df388bd1b601e5b27f6447e2075f7 Mon Sep 17 00:00:00 2001 From: HaoZeke Date: Wed, 9 May 2018 13:02:48 +0530 Subject: [PATCH 1/3] Revert "Huge performance improvement if you use `rvm` segment." This reverts commit 643555a30c9576838157e04d45632080472e1b8b. This does allow rvm to be detected even without using the depreciated gemset settings. --- powerlevel9k.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 383a3b91..a0869f19 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1365,10 +1365,10 @@ prompt_rspec_stats() { ################################################################ # Segment to display Ruby Version Manager information prompt_rvm() { - local version_and_gemset=${rvm_env_string/ruby-} + local version_and_gemset=${$(rvm-prompt)/ruby-} if [[ -n "$version_and_gemset" ]]; then - "$1_prompt_segment" "$0" "$2" "grey35" "$DEFAULT_COLOR" "$version_and_gemset" 'RUBY_ICON' + "$1_prompt_segment" "$0" "$2" "240" "$DEFAULT_COLOR" "$version_and_gemset" 'RUBY_ICON' fi } From a41f2e81ae30a5e64269c8079e75acfd878a6cb8 Mon Sep 17 00:00:00 2001 From: HaoZeke Date: Fri, 4 Jan 2019 08:44:32 +0530 Subject: [PATCH 2/3] rvm: Only show version and patchset --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index a0869f19..bed5b9cc 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1365,7 +1365,7 @@ prompt_rspec_stats() { ################################################################ # Segment to display Ruby Version Manager information prompt_rvm() { - local version_and_gemset=${$(rvm-prompt)/ruby-} + local version_and_gemset=${$(rvm-prompt v p)/ruby-} if [[ -n "$version_and_gemset" ]]; then "$1_prompt_segment" "$0" "$2" "240" "$DEFAULT_COLOR" "$version_and_gemset" 'RUBY_ICON' From 58f70e57e65097e73604e35b8e8334a8e34afbee Mon Sep 17 00:00:00 2001 From: HaoZeke Date: Sat, 5 Jan 2019 02:29:05 +0530 Subject: [PATCH 3/3] rvm: Use @natemccurdy review suggestions --- powerlevel9k.zsh-theme | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index bed5b9cc..fc8c4703 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1365,10 +1365,12 @@ prompt_rspec_stats() { ################################################################ # Segment to display Ruby Version Manager information prompt_rvm() { - local version_and_gemset=${$(rvm-prompt v p)/ruby-} + if [ $commands[rvm-prompt] ]; then + local version_and_gemset=${$(rvm-prompt v p)/ruby-} - if [[ -n "$version_and_gemset" ]]; then - "$1_prompt_segment" "$0" "$2" "240" "$DEFAULT_COLOR" "$version_and_gemset" 'RUBY_ICON' + if [[ -n "$version_and_gemset" ]]; then + "$1_prompt_segment" "$0" "$2" "240" "$DEFAULT_COLOR" "$version_and_gemset" 'RUBY_ICON' + fi fi }