ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-10 22:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Felipe Oliveira 2020-12-22 18:33:16 -03:00 committed by GitHub
commit 11808cfd37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,7 +11,6 @@ addons:
cache: cache:
ccache: true ccache: true
directories: directories:
- $HOME/.npm
- $TRAVIS_BUILD_DIR/.cache - $TRAVIS_BUILD_DIR/.cache
- $TRAVIS_BUILD_DIR/node_modules - $TRAVIS_BUILD_DIR/node_modules
before_install: before_install:

4
nvm.sh
View File

@ -2338,7 +2338,8 @@ nvm_die_on_prefix() {
# npm first looks at $PREFIX (case-sensitive) # 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. # 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 deactivate >/dev/null 2>&1
nvm_err "nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"${PREFIX}\"" nvm_err "nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"${PREFIX}\""
nvm_err 'Run `unset PREFIX` to unset it.' nvm_err 'Run `unset PREFIX` to unset it.'
@ -2554,6 +2555,7 @@ nvm() {
return $? return $?
fi fi
local i
for i in "$@" for i in "$@"
do do
case $i in case $i in