diff --git a/.travis.yml b/.travis.yml index a04fac1..7e991ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ addons: cache: ccache: true directories: - - $HOME/.npm - $TRAVIS_BUILD_DIR/.cache - $TRAVIS_BUILD_DIR/node_modules before_install: diff --git a/nvm.sh b/nvm.sh index 5a27ae6..2f59708 100644 --- a/nvm.sh +++ b/nvm.sh @@ -2338,7 +2338,8 @@ nvm_die_on_prefix() { # npm first looks at $PREFIX (case-sensitive) # we do not bother to test the value here; if this env var is set, unset it to continue. - if [ -n "${PREFIX-}" ]; then + # however, `npm exec` in npm v7.2+ sets $PREFIX; if set, inherit it + if [ -n "${PREFIX-}" ] && [ "$(nvm_version_path "$(node -v)")" != "${PREFIX}" ]; then nvm deactivate >/dev/null 2>&1 nvm_err "nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"${PREFIX}\"" nvm_err 'Run `unset PREFIX` to unset it.' @@ -2554,6 +2555,7 @@ nvm() { return $? fi + local i for i in "$@" do case $i in