From f7b7ff21c9885a2a94f174336416dafa8b96c470 Mon Sep 17 00:00:00 2001 From: Sudarshan Wadkar Date: Mon, 14 Mar 2016 20:57:30 -0400 Subject: [PATCH 1/2] Fix NVM prompt to return if not used This commit changes nvm prompt setup to return immediately if no node version is installed/available. Currently, prompt complains for lack of global node version. Specifically, if you install nvm (from brew or manually) and do not have global node installed (or set), then the prompt should not set or show anything. This commit ensures this by immediately returning if `nvm current` returns "none". --- powerlevel9k.zsh-theme | 1 + 1 file changed, 1 insertion(+) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 2ef4fe3c..c69c32c6 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -560,6 +560,7 @@ prompt_node_version() { prompt_nvm() { [[ ! $(type nvm) =~ 'nvm is a shell function'* ]] && return local node_version=$(nvm current) + [[ ${node_version} = "none" ]] && return local nvm_default=$(cat $NVM_DIR/alias/default) [[ -z "${node_version}" ]] && return [[ "$node_version" =~ "$nvm_default" ]] && return From 7fcac16c5fa6ef6953e0fb168707a4e01e9b136d Mon Sep 17 00:00:00 2001 From: Sudarshan Wadkar Date: Wed, 16 Mar 2016 17:25:39 -0400 Subject: [PATCH 2/2] Combine two checks into one --- powerlevel9k.zsh-theme | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c69c32c6..cb1ab338 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -560,9 +560,8 @@ prompt_node_version() { prompt_nvm() { [[ ! $(type nvm) =~ 'nvm is a shell function'* ]] && return local node_version=$(nvm current) - [[ ${node_version} = "none" ]] && return + [[ -z "${node_version}" ]] || [[ ${node_version} = "none" ]] && return local nvm_default=$(cat $NVM_DIR/alias/default) - [[ -z "${node_version}" ]] && return [[ "$node_version" =~ "$nvm_default" ]] && return $1_prompt_segment "$0" "$2" "green" "011" "${node_version:1}" 'NODE_ICON'