remove tabs that trapped in

This commit is contained in:
Tobias Gurtzick 2017-08-26 23:10:02 +02:00
parent c9aaeffcbd
commit dca77165c5
No known key found for this signature in database
GPG Key ID: 6C56E4E3D2EAC901

32
nvm.sh
View File

@ -2117,22 +2117,22 @@ nvm_die_on_prefix() {
fi fi
done done
if [[ -n $NVM_NPM_PREFIX ]]; then if [[ -n $NVM_NPM_PREFIX ]]; then
if ! (nvm_tree_contains_path "$NVM_DIR" "$NVM_NPM_PREFIX" >/dev/null 2>&1); then if ! (nvm_tree_contains_path "$NVM_DIR" "$NVM_NPM_PREFIX" >/dev/null 2>&1); then
if [ "_$NVM_DELETE_PREFIX" = "_1" ]; then if [ "_$NVM_DELETE_PREFIX" = "_1" ]; then
npm config --loglevel=warn delete prefix npm config --loglevel=warn delete prefix
else else
nvm deactivate >/dev/null 2>&1 nvm deactivate >/dev/null 2>&1
nvm_err "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\"" nvm_err "nvm is not compatible with the npm config \"prefix\" option: currently set to \"$NVM_NPM_PREFIX\""
if nvm_has 'npm'; then if nvm_has 'npm'; then
nvm_err "Run \`npm config delete prefix\` or \`$NVM_COMMAND\` to unset it." nvm_err "Run \`npm config delete prefix\` or \`$NVM_COMMAND\` to unset it."
else else
nvm_err "Run \`$NVM_COMMAND\` to unset it." nvm_err "Run \`$NVM_COMMAND\` to unset it."
fi fi
return 10 return 10
fi fi
fi fi
fi fi
} }
# Succeeds if $IOJS_VERSION represents an io.js version that has a # Succeeds if $IOJS_VERSION represents an io.js version that has a