From 93e0070a44134be7833ee8274aab1324533f95f7 Mon Sep 17 00:00:00 2001
From: Matteo De Wint <matteo@novemberfive.co>
Date: Sat, 28 Nov 2020 15:16:35 +0100
Subject: [PATCH] [Fix] `nvm_die_on_prefix`: filter prefixed env vars on name
 only, ignoring values

---
 nvm.sh                                 | 6 +-----
 test/fast/Unit tests/nvm_die_on_prefix | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nvm.sh b/nvm.sh
index e1da3b1..49d22fd 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -2488,11 +2488,7 @@ nvm_die_on_prefix() {
   # here, we avoid trying to replicate "which one wins" or testing the value; if any are defined, it errors
   # until none are left.
   local NVM_NPM_CONFIG_x_PREFIX_ENV
-  if [ -n "${BASH_SOURCE-}" ]; then
-    NVM_NPM_CONFIG_x_PREFIX_ENV="$(command set | command awk -F '=' '! /^[0-9A-Z_a-z]+=/ {skip=1} skip==0 {print $1}' | nvm_grep -i NPM_CONFIG_PREFIX | command tail -1)"
-  else
-    NVM_NPM_CONFIG_x_PREFIX_ENV="$(command env | nvm_grep -i NPM_CONFIG_PREFIX | command tail -1 | command awk -F '=' '{print $1}')"
-  fi
+  NVM_NPM_CONFIG_x_PREFIX_ENV="$(command awk 'BEGIN { for (name in ENVIRON) if (toupper(name) == "NPM_CONFIG_PREFIX") { print name; break } }')"
   if [ -n "${NVM_NPM_CONFIG_x_PREFIX_ENV-}" ]; then
     local NVM_CONFIG_VALUE
     eval "NVM_CONFIG_VALUE=\"\$${NVM_NPM_CONFIG_x_PREFIX_ENV}\""
diff --git a/test/fast/Unit tests/nvm_die_on_prefix b/test/fast/Unit tests/nvm_die_on_prefix
index f06a9bf..0a2429e 100755
--- a/test/fast/Unit tests/nvm_die_on_prefix	
+++ b/test/fast/Unit tests/nvm_die_on_prefix	
@@ -84,6 +84,9 @@ EXIT_CODE="$(export npm_CONFIG_PREFIX=bar ; nvm_die_on_prefix 0 foo "$(nvm_versi
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'npm_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
 [ "_$EXIT_CODE" = "_4" ] || die "'npm_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo' did not exit with 4; got '$EXIT_CODE'"
 
+OUTPUT="$(export FOO='This contains NPM_CONFIG_PREFIX' ; nvm_die_on_prefix 0 foo "$(nvm_version_dir new)" 2>&1)"
+[ -z "$OUTPUT" ] || die "'nvm_die_on_prefix' was not a noop; got '$OUTPUT'"
+
 # npmrc tests
 (
   cd "${TEST_DIR}"