Merge pull request #898 from PeterDaveHello/patch-1

[refactor] use "case" instead of if/else in install
Jordan Harband 2016-07-02 13:02:24 -07:00 committed by GitHub
commit 1bcd2f4743
1 changed files with 18 additions and 13 deletions

31
nvm.sh
View File

@ -1943,19 +1943,24 @@ nvm() {
if [ -z "${NVM_MAKE_JOBS-}" ]; then if [ -z "${NVM_MAKE_JOBS-}" ]; then
nvm_get_make_jobs nvm_get_make_jobs
fi fi
if [ "$NVM_IOJS" != true ] && [ "$NVM_NODE_MERGED" != true ]; then
if nvm_install_node_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS"; then case "true" in
NVM_INSTALL_SUCCESS=true "$NVM_IOJS")
fi # nvm_install_iojs_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS"
elif [ "$NVM_IOJS" = true ]; then nvm_err 'Installing iojs from source is not currently supported'
# nvm_install_iojs_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS" return 105
nvm_err 'Installing iojs from source is not currently supported' ;;
return 105 "$NVM_NODE_MERGED")
elif [ "$NVM_NODE_MERGED" = true ]; then # nvm_install_merged_node_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS"
# nvm_install_merged_node_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS" nvm_err 'Installing node v1.0 and greater from source is not currently supported'
nvm_err 'Installing node v1.0 and greater from source is not currently supported' return 106
return 106 ;;
fi *)
if nvm_install_node_source "$VERSION" "$NVM_MAKE_JOBS" "$ADDITIONAL_PARAMETERS"; then
NVM_INSTALL_SUCCESS=true
fi
;;
esac
fi fi
if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then