From 6fa92c82caef03081de0adca99f6256e5fd209ca Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Sun, 15 Dec 2019 23:39:32 -0800
Subject: [PATCH] [Fix] if a prefix env var is set (as in npm run), but is
 correct, do not fail

Fixes #2106.
---
 nvm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nvm.sh b/nvm.sh
index 639165c..77fefa4 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -2187,7 +2187,7 @@ nvm_die_on_prefix() {
   if [ -n "${NVM_NPM_CONFIG_PREFIX_ENV-}" ]; then
     local NVM_CONFIG_VALUE
     eval "NVM_CONFIG_VALUE=\"\$${NVM_NPM_CONFIG_PREFIX_ENV}\""
-    if [ -n "${NVM_CONFIG_VALUE-}" ]; then
+    if [ -n "${NVM_CONFIG_VALUE-}" ] && ! nvm_tree_contains_path "${NVM_DIR}" "${NVM_CONFIG_VALUE}"; then
       nvm deactivate >/dev/null 2>&1
       nvm_err "nvm is not compatible with the \"${NVM_NPM_CONFIG_PREFIX_ENV}\" environment variable: currently set to \"${NVM_CONFIG_VALUE}\""
       nvm_err "Run \`unset ${NVM_NPM_CONFIG_PREFIX_ENV}\` to unset it."