From 3c4d8e146558a42776cfebc6632cebe54dbed69b Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Sun, 6 Sep 2020 21:14:50 -0700 Subject: [PATCH] Add NVM_DIR to install, minor edits to nvm item --- functions/_tide_item_nvm.fish | 2 +- tools/_tide_actual_install.fish | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/functions/_tide_item_nvm.fish b/functions/_tide_item_nvm.fish index 339580c..6f27967 100644 --- a/functions/_tide_item_nvm.fish +++ b/functions/_tide_item_nvm.fish @@ -1,6 +1,6 @@ function _tide_item_nvm if set -l whichNode (which node 2>/dev/null) # Ensure node is installed - set -l nodeVersion (node --version) + set -l nodeVersion (string split / $whichNode)[-3] # Much faster than node --version if test -n "$tide_nvm_default_node" if test "$tide_nvm_default_node" != "$nodeVersion" diff --git a/tools/_tide_actual_install.fish b/tools/_tide_actual_install.fish index c8bfd8a..869831f 100644 --- a/tools/_tide_actual_install.fish +++ b/tools/_tide_actual_install.fish @@ -75,6 +75,7 @@ function _set_immutables _set_immutable _tide_color_normal (set_color normal) _set_immutable VIRTUAL_ENV_DISABLE_PROMPT true + _set_immutable NVM_DIR $HOME/.nvm end function _set_immutable -a var_name