From 2d92d9817f85310c7c6b0842a242886320a91cc9 Mon Sep 17 00:00:00 2001 From: shine Date: Sat, 17 Jun 2017 17:36:33 +0530 Subject: [PATCH 1/2] Honor NVM_DIR shell variable set externally --- plugins/available/nvm.plugin.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/available/nvm.plugin.bash b/plugins/available/nvm.plugin.bash index 3959c236..f4ccfdc7 100644 --- a/plugins/available/nvm.plugin.bash +++ b/plugins/available/nvm.plugin.bash @@ -5,7 +5,7 @@ cite about-plugin about-plugin 'node version manager configuration' -export NVM_DIR="$HOME/.nvm" +[ -v $NVM_DIR ] && NVM_DIR="$HOME/.nvm" # This loads nvm if command -v brew &>/dev/null && [ -s $(brew --prefix nvm)/nvm.sh ] then From 76d7dfd8bc5d8373813cbee96e5345f380eb74a8 Mon Sep 17 00:00:00 2001 From: shine Date: Mon, 19 Jun 2017 23:28:12 +0530 Subject: [PATCH 2/2] Resolve https://github.com/Bash-it/bash-it/pull/980#pullrequestreview-44766052 --- plugins/available/nvm.plugin.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/available/nvm.plugin.bash b/plugins/available/nvm.plugin.bash index f4ccfdc7..a36579c2 100644 --- a/plugins/available/nvm.plugin.bash +++ b/plugins/available/nvm.plugin.bash @@ -5,7 +5,7 @@ cite about-plugin about-plugin 'node version manager configuration' -[ -v $NVM_DIR ] && NVM_DIR="$HOME/.nvm" +export NVM_DIR=${NVM_DIR:- $HOME/.nvm} # This loads nvm if command -v brew &>/dev/null && [ -s $(brew --prefix nvm)/nvm.sh ] then