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

When `node` version is not io.js and is v1.0 or later, on `nvm install`, run `nvm_install_merged_node_binary`

Jordan Harband 2015-08-22 22:10:33 -07:00
parent 0181821b51
commit 0d898b0aa4
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nvm.sh
View File

@ -1398,9 +1398,12 @@ nvm() {
return 5 return 5
fi fi
local NVM_NODE_MERGED
local NVM_IOJS local NVM_IOJS
if nvm_is_iojs_version "$VERSION"; then if nvm_is_iojs_version "$VERSION"; then
NVM_IOJS=true NVM_IOJS=true
elif nvm_is_merged_node_version "$VERSION"; then
NVM_NODE_MERGED=true
fi fi
local VERSION_PATH local VERSION_PATH
@ -1416,7 +1419,7 @@ nvm() {
if [ "_$NVM_OS" = "_freebsd" ]; then if [ "_$NVM_OS" = "_freebsd" ]; then
# node.js and io.js do not have a FreeBSD binary # node.js and io.js do not have a FreeBSD binary
nobinary=1 nobinary=1
elif [ "_$NVM_OS" = "_sunos" ] && [ "$NVM_IOJS" = true ]; then elif [ "_$NVM_OS" = "_sunos" ] && [ "$NVM_IOJS" = true ] || [ "$NVM_NODE_MERGED" = true ]; then
# io.js does not have a SunOS binary # io.js does not have a SunOS binary
nobinary=1 nobinary=1
fi fi
@ -1425,6 +1428,8 @@ nvm() {
if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then
if [ "$NVM_IOJS" = true ] && nvm_install_iojs_binary std "$VERSION" "$REINSTALL_PACKAGES_FROM"; then if [ "$NVM_IOJS" = true ] && nvm_install_iojs_binary std "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
NVM_INSTALL_SUCCESS=true NVM_INSTALL_SUCCESS=true
elif [ "$NVM_NODE_MERGED" = true ] && nvm_install_merged_node_binary std "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
NVM_INSTALL_SUCCESS=true
elif [ "$NVM_IOJS" != true ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then elif [ "$NVM_IOJS" != true ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
NVM_INSTALL_SUCCESS=true NVM_INSTALL_SUCCESS=true
fi fi
@ -1434,6 +1439,10 @@ nvm() {
# 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
elif [ "$NVM_NODE_MERGED" = true ]; then
# nvm_install_merged_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"
echo "Installing node v1.0 and greater from source is not currently supported" >&2
return 106
elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
NVM_INSTALL_SUCCESS=true NVM_INSTALL_SUCCESS=true
fi fi