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

[Fix] Install failed should return correct exit status, fix

Peter Dave Hello 2016-12-10 00:20:04 +08:00 committed by Jordan Harband
parent 1e6b5ce039
commit 50ae1e5199
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 11 additions and 13 deletions

24
nvm.sh
View File

@ -2394,8 +2394,8 @@ nvm() {
return $? return $?
fi fi
local NVM_INSTALL_SUCCESS local EXIT_CODE
NVM_INSTALL_SUCCESS=false EXIT_CODE=-1
if [ -n "${NVM_INSTALL_THIRD_PARTY_HOOK-}" ]; then if [ -n "${NVM_INSTALL_THIRD_PARTY_HOOK-}" ]; then
nvm_err '** $NVM_INSTALL_THIRD_PARTY_HOOK env var set; dispatching to third-party installation method **' nvm_err '** $NVM_INSTALL_THIRD_PARTY_HOOK env var set; dispatching to third-party installation method **'
local NVM_METHOD_PREFERENCE local NVM_METHOD_PREFERENCE
@ -2405,7 +2405,6 @@ nvm() {
fi fi
local VERSION_PATH local VERSION_PATH
VERSION_PATH="$(nvm_version_path "${VERSION}")" VERSION_PATH="$(nvm_version_path "${VERSION}")"
local EXIT_CODE
"${NVM_INSTALL_THIRD_PARTY_HOOK}" "${VERSION}" "${FLAVOR}" std "${NVM_METHOD_PREFERENCE}" "${VERSION_PATH}" || { "${NVM_INSTALL_THIRD_PARTY_HOOK}" "${VERSION}" "${FLAVOR}" std "${NVM_METHOD_PREFERENCE}" "${VERSION_PATH}" || {
EXIT_CODE=$? EXIT_CODE=$?
nvm_err '*** Third-party $NVM_INSTALL_THIRD_PARTY_HOOK env var failed to install! ***' nvm_err '*** Third-party $NVM_INSTALL_THIRD_PARTY_HOOK env var failed to install! ***'
@ -2415,7 +2414,7 @@ nvm() {
nvm_err '*** Third-party $NVM_INSTALL_THIRD_PARTY_HOOK env var claimed to succeed, but failed to install! ***' nvm_err '*** Third-party $NVM_INSTALL_THIRD_PARTY_HOOK env var claimed to succeed, but failed to install! ***'
return 33 return 33
fi fi
NVM_INSTALL_SUCCESS=true EXIT_CODE=0
else else
if [ "_$NVM_OS" = "_freebsd" ]; then if [ "_$NVM_OS" = "_freebsd" ]; then
@ -2432,23 +2431,21 @@ nvm() {
# skip binary install if "nobinary" option specified. # skip binary install if "nobinary" option specified.
if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then
if nvm_install_binary "${FLAVOR}" std "${VERSION}"; then nvm_install_binary "${FLAVOR}" std "${VERSION}"
NVM_INSTALL_SUCCESS=true EXIT_CODE=$?
fi
fi fi
if [ "$NVM_INSTALL_SUCCESS" != true ]; then if [ "$EXIT_CODE" -ne 0 ]; then
if [ -z "${NVM_MAKE_JOBS-}" ]; then if [ -z "${NVM_MAKE_JOBS-}" ]; then
nvm_get_make_jobs nvm_get_make_jobs
fi fi
if nvm_install_source "${FLAVOR}" std "${VERSION}" "${NVM_MAKE_JOBS}" "${ADDITIONAL_PARAMETERS}"; then nvm_install_source "${FLAVOR}" std "${VERSION}" "${NVM_MAKE_JOBS}" "${ADDITIONAL_PARAMETERS}"
NVM_INSTALL_SUCCESS=true EXIT_CODE=$?
fi
fi fi
fi fi
if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then if [ "$EXIT_CODE" -eq 0 ] && nvm use "$VERSION"; then
if [ -n "${LTS-}" ]; then if [ -n "${LTS-}" ]; then
nvm_ensure_default_set "lts/${LTS}" nvm_ensure_default_set "lts/${LTS}"
else else
@ -2457,9 +2454,10 @@ nvm() {
if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \ if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
&& [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
nvm reinstall-packages "$REINSTALL_PACKAGES_FROM" nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
EXIT_CODE=$?
fi fi
fi fi
return $? return $EXIT_CODE
;; ;;
"uninstall" ) "uninstall" )
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then