273345896
/
nvm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] `set -e`: ensure `nvm_version` returning 3, and `nvm_alias` returning 2, doesn’t terminate the process.

Jordan Harband 2016-05-04 01:03:14 -07:00
parent 1c3f8da6c3
commit 0dd2846215
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nvm.sh
View File

@ -399,7 +399,7 @@ nvm_print_formatted_alias() {
local VERSION_FORMAT local VERSION_FORMAT
local ALIAS_FORMAT local ALIAS_FORMAT
local DEST_FORMAT local DEST_FORMAT
VERSION="$(nvm_version "$DEST")" VERSION="$(nvm_version "$DEST" || return 0)"
ALIAS_FORMAT='%s' ALIAS_FORMAT='%s'
DEST_FORMAT='%s' DEST_FORMAT='%s'
VERSION_FORMAT='%s' VERSION_FORMAT='%s'
@ -444,7 +444,7 @@ nvm_print_alias_path() {
local ALIAS local ALIAS
ALIAS="${ALIAS_PATH##$NVM_ALIAS_DIR\/}" ALIAS="${ALIAS_PATH##$NVM_ALIAS_DIR\/}"
local DEST local DEST
DEST="$(nvm_alias "$ALIAS" 2> /dev/null)" DEST="$(nvm_alias "$ALIAS" 2> /dev/null || return 0)"
if [ -n "$DEST" ]; then if [ -n "$DEST" ]; then
DEFAULT=false nvm_print_formatted_alias "$ALIAS" "$DEST" DEFAULT=false nvm_print_formatted_alias "$ALIAS" "$DEST"
fi fi
@ -1797,11 +1797,11 @@ nvm() {
case "$1" in case "$1" in
--reinstall-packages-from=*) --reinstall-packages-from=*)
PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 27-)" PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 27-)"
REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")" REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM" || return 0)"
;; ;;
--copy-packages-from=*) --copy-packages-from=*)
PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 22-)" PROVIDED_REINSTALL_PACKAGES_FROM="$(echo "$1" | command cut -c 22-)"
REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM")" REINSTALL_PACKAGES_FROM="$(nvm_version "$PROVIDED_REINSTALL_PACKAGES_FROM" || return 0)"
;; ;;
*) *)
ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1" ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
@ -2121,7 +2121,7 @@ nvm() {
nvm_rc_version && has_checked_nvmrc=1 nvm_rc_version && has_checked_nvmrc=1
fi fi
if [ -n "$NVM_RC_VERSION" ]; then if [ -n "$NVM_RC_VERSION" ]; then
VERSION="$(nvm_version "$NVM_RC_VERSION")" VERSION="$(nvm_version "$NVM_RC_VERSION" || return 0)"
else else
VERSION='N/A' VERSION='N/A'
fi fi
@ -2133,7 +2133,7 @@ nvm() {
provided_version="$1" provided_version="$1"
if [ -n "$provided_version" ]; then if [ -n "$provided_version" ]; then
VERSION="$(nvm_version "$provided_version")" VERSION="$(nvm_version "$provided_version" || return 0)"
if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
provided_version='' provided_version=''
if [ $has_checked_nvmrc -ne 1 ]; then if [ $has_checked_nvmrc -ne 1 ]; then
@ -2143,7 +2143,7 @@ nvm() {
nvm_rc_version && has_checked_nvmrc=1 nvm_rc_version && has_checked_nvmrc=1
fi fi
fi fi
VERSION="$(nvm_version "$NVM_RC_VERSION")" VERSION="$(nvm_version "$NVM_RC_VERSION" || return 0)"
else else
shift shift
fi fi
@ -2205,7 +2205,7 @@ nvm() {
local provided_version local provided_version
provided_version="$1" provided_version="$1"
if [ -n "$provided_version" ]; then if [ -n "$provided_version" ]; then
VERSION="$(nvm_version "$provided_version")" VERSION="$(nvm_version "$provided_version" || return 0)"
if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
if [ "$NVM_SILENT" -eq 1 ]; then if [ "$NVM_SILENT" -eq 1 ]; then
nvm_rc_version >/dev/null 2>&1 nvm_rc_version >/dev/null 2>&1
@ -2213,7 +2213,7 @@ nvm() {
nvm_rc_version nvm_rc_version
fi fi
provided_version="$NVM_RC_VERSION" provided_version="$NVM_RC_VERSION"
VERSION="$(nvm_version "$provided_version")" VERSION="$(nvm_version "$provided_version" || return 0)"
else else
shift shift
fi fi
@ -2300,10 +2300,10 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
nvm_rc_version nvm_rc_version
if [ -n "$NVM_RC_VERSION" ]; then if [ -n "$NVM_RC_VERSION" ]; then
provided_version="$NVM_RC_VERSION" provided_version="$NVM_RC_VERSION"
VERSION=$(nvm_version "$NVM_RC_VERSION") VERSION=$(nvm_version "$NVM_RC_VERSION" || return 0)
fi fi
elif [ "_$2" != '_system' ]; then elif [ "_$2" != '_system' ]; then
VERSION="$(nvm_version "$provided_version")" VERSION="$(nvm_version "$provided_version" || return 0)"
else else
VERSION="$2" VERSION="$2"
fi fi
@ -2368,8 +2368,8 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
>&2 echo "Aliases in subdirectories are not supported." >&2 echo "Aliases in subdirectories are not supported."
return 1 return 1
fi fi
VERSION="$(nvm_version "${3-}")" VERSION="$(nvm_version "${3-}" || return 0)"
if [ $? -ne 0 ]; then if [ "$VERSION" = 'N/A' ]; then
echo "! WARNING: Version '${3-}' does not exist." >&2 echo "! WARNING: Version '${3-}' does not exist." >&2
fi fi
nvm_make_alias "${2-}" "${3-}" nvm_make_alias "${2-}" "${3-}"
@ -2406,7 +2406,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
local PROVIDED_VERSION local PROVIDED_VERSION
PROVIDED_VERSION="$2" PROVIDED_VERSION="$2"
if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION")" = "$(nvm_ls_current)" ]; then if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version "$PROVIDED_VERSION" || return 0)" = "$(nvm_ls_current)" ]; then
echo 'Can not reinstall packages from the current version of node.' >&2 echo 'Can not reinstall packages from the current version of node.' >&2
return 2 return 2
fi fi
@ -2419,7 +2419,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
fi fi
VERSION="system" VERSION="system"
else else
VERSION="$(nvm_version "$PROVIDED_VERSION")" VERSION="$(nvm_version "$PROVIDED_VERSION" || return 0)"
fi fi
local NPMLIST local NPMLIST