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

[Refactor] `nvm install`: remove unused `REINSTALL_PACKAGES_FROM` argument to inner installation helpers.

Jordan Harband 2016-08-11 10:42:32 -07:00
parent 08cbcf2254
commit ec4efa3ec7
No known key found for this signature in database
GPG Key ID: 64A196AEE0916D55
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nvm.sh
View File

@ -1349,8 +1349,6 @@ nvm_install_merged_node_binary() {
fi fi
local VERSION local VERSION
VERSION="${2}" VERSION="${2}"
local REINSTALL_PACKAGES_FROM
REINSTALL_PACKAGES_FROM="${3}"
if ! nvm_is_merged_node_version "${VERSION}" || nvm_is_iojs_version "${VERSION}"; then if ! nvm_is_merged_node_version "${VERSION}" || nvm_is_iojs_version "${VERSION}"; then
nvm_err 'nvm_install_merged_node_binary requires a node version v4.0 or greater.' nvm_err 'nvm_install_merged_node_binary requires a node version v4.0 or greater.'
@ -1427,8 +1425,6 @@ nvm_install_iojs_binary() {
fi fi
local PREFIXED_VERSION local PREFIXED_VERSION
PREFIXED_VERSION="$2" PREFIXED_VERSION="$2"
local REINSTALL_PACKAGES_FROM
REINSTALL_PACKAGES_FROM="$3"
if ! nvm_is_iojs_version "$PREFIXED_VERSION"; then if ! nvm_is_iojs_version "$PREFIXED_VERSION"; then
nvm_err 'nvm_install_iojs_binary requires an iojs-prefixed version.' nvm_err 'nvm_install_iojs_binary requires an iojs-prefixed version.'
@ -1493,8 +1489,6 @@ nvm_install_iojs_binary() {
nvm_install_node_binary() { nvm_install_node_binary() {
local VERSION local VERSION
VERSION="$1" VERSION="$1"
local REINSTALL_PACKAGES_FROM
REINSTALL_PACKAGES_FROM="$2"
if nvm_is_iojs_version "$VERSION"; then if nvm_is_iojs_version "$VERSION"; then
nvm_err 'nvm_install_node_binary does not allow an iojs-prefixed version.' nvm_err 'nvm_install_node_binary does not allow an iojs-prefixed version.'
@ -2110,11 +2104,11 @@ nvm() {
local NVM_INSTALL_SUCCESS local NVM_INSTALL_SUCCESS
# 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_IOJS" = true ] && nvm_install_iojs_binary std "$VERSION" "$REINSTALL_PACKAGES_FROM"; then if [ "$NVM_IOJS" = true ] && nvm_install_iojs_binary std "$VERSION"; 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 elif [ "$NVM_NODE_MERGED" = true ] && nvm_install_merged_node_binary std "$VERSION"; then
NVM_INSTALL_SUCCESS=true 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"; then
NVM_INSTALL_SUCCESS=true NVM_INSTALL_SUCCESS=true
fi fi
fi fi