eeymoo/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-10-31 18:25:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor refactoring to "install from source" logic tree.

Browse Source
This commit is contained in:
Jordan Harband
2015-09-10 22:37:50 +09:00
parent c9215a127f
commit 014a44e154
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nvm.sh
View File

@@ -1442,7 +1442,11 @@ nvm() {
fi fi
fi fi
if [ "$NVM_INSTALL_SUCCESS" != true ]; then if [ "$NVM_INSTALL_SUCCESS" != true ]; then
if [ "$NVM_IOJS" = true ]; then if [ "$NVM_IOJS" != true ] && [ "$NVM_NODE_MERGED" != true ]; then
if nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
NVM_INSTALL_SUCCESS=true
fi
elif [ "$NVM_IOJS" = true ]; then
# nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS" # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
echo "Installing iojs from source is not currently supported" >&2 echo "Installing iojs from source is not currently supported" >&2
return 105 return 105
@@ -1450,8 +1454,6 @@ nvm() {
# nvm_install_merged_node_source "$VERSION" "$ADDITIONAL_PARAMETERS" # nvm_install_merged_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"
echo "Installing node v1.0 and greater from source is not currently supported" >&2 echo "Installing node v1.0 and greater from source is not currently supported" >&2
return 106 return 106
elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
NVM_INSTALL_SUCCESS=true
fi fi
fi fi