summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChigozirim C <nobleman.code@gmx.com>2019-04-27 01:38:14 -0600
committerMarc Cornellà <marc.cornella@live.com>2020-10-09 17:21:03 +0200
commitd6f3630932f364370c08b5a02b88c74aed577463 (patch)
treea8f176b3d6bce3698f8861bd7699d014f580dec4
parentd8cb67023540c1e2e7e4e211e2f7c9fc2d4e0c3c (diff)
downloadzsh-d6f3630932f364370c08b5a02b88c74aed577463.tar.gz
zsh-d6f3630932f364370c08b5a02b88c74aed577463.tar.bz2
zsh-d6f3630932f364370c08b5a02b88c74aed577463.zip
nvm: check $XDG_CONFIG_HOME/nvm for an nvm installation
Closes #7807 Co-authored-by: Marc Cornellà <marc.cornella@live.com>
-rw-r--r--plugins/nvm/nvm.plugin.zsh10
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 2c137894b..21fb3112b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,5 +1,11 @@
-# Set NVM_DIR if it isn't already defined
-[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
+# See https://github.com/nvm-sh/nvm#installation-and-update
+if [[ -z "$NVM_DIR" ]]; then
+ if [[ -d "$HOME/.nvm" ]]; then
+ export NVM_DIR="$HOME/.nvm"
+ elif [[ -d "${XDG_CONFIG_HOME:-$HOME/.config}/nvm" ]]; then
+ export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
+ fi
+fi
# Don't try to load nvm if command already available
which nvm &> /dev/null && return