ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-12 07:01:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed some PR comments

Browse Source
This commit is contained in:
Spencer Hakim 2016-05-18 13:45:48 -04:00
parent bd142a8421
commit ba5f880847
No known key found for this signature in database
GPG Key ID: C5B23AACCA9988AE
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
nvm.sh
View File

@ -403,6 +403,31 @@ nvm_num_version_groups() {
nvm_echo "${#NVM_NUM_GROUPS}" nvm_echo "${#NVM_NUM_GROUPS}"
} }
nvm_get_upgrade_version() {
if [ $# -lt 1 ]; then
nvm_echo 'N/A'
return 1
fi
local VERSION
VERSION="$1"
local semver_major
semver_major="$(nvm_echo \"$base_version\" | command sed -e 's/v\([0-9]\+\)\.\([0-9]\+\).*/\1/')"
local semver_minor
semver_minor="$(nvm_echo \"$base_version\" | command sed -e 's/v\([0-9]\+\)\.\([0-9]\+\).*/\2/')"
local install_version
if [ $semver_major = '0' ]; then
install_version="v0.$semver_minor"
else
install_version="v$semver_major"
fi
nvm_echo "$(nvm_remote_version \"$install_version\")"
}
nvm_strip_path() { nvm_strip_path() {
if [ -z "${NVM_DIR-}" ]; then if [ -z "${NVM_DIR-}" ]; then
nvm_err '$NVM_DIR not set!' nvm_err '$NVM_DIR not set!'
@ -1960,44 +1985,30 @@ nvm() {
base_version="$(nvm_ls_current)" base_version="$(nvm_ls_current)"
if [ $# -ge 2 ]; then if [ $# -ge 2 ]; then
base_version="$(nvm_match_version $2)" base_version="$(nvm_match_version \"$1\")"
if [ $base_version = "N/A" ]; then
nvm_err 'Cannot find the specified version'
return 1
fi
fi fi
if [ $base_version = "none" ]; then if [ $base_version = 'none' ]; then
nvm_err 'No version currently active, cannot upgrade' nvm_err 'No version currently active, cannot upgrade'
return 1 return 1
fi fi
if [ $base_version = "system" ]; then if [ $base_version = 'system' ]; then
nvm_err 'Cannot upgrade the system version of node' nvm_err 'Cannot upgrade the system version of node'
return 1 return 1
fi fi
local semver_major
semver_major="$(echo $base_version | sed 's/v\([0-9]\+\)\.\([0-9]\+\).*/\1/')"
local semver_minor
semver_minor="$(echo $base_version | sed 's/v\([0-9]\+\)\.\([0-9]\+\).*/\2/')"
local install_version local install_version
if [ $semver_major = '0' ]; then install_version="$(nvm_get_upgrade_version \"$base_version\")"
install_version="v0.$semver_minor"
else if [ $install_version = 'N/A' ]; then
install_version="v$semver_major" nvm_err 'Unable to determine the version to upgrade to'
return 2
fi fi
if ! nvm_is_valid_version $install_version; then nvm_echo "Upgrading $base_version to $install_version"
nvm_err 'Failed to determine current version' nvm_echo "($base_version will remain installed. Please adjust your aliases as necessary.)"
return 1 nvm install "$install_version" --reinstall-packages-from="$base_version"
fi
nvm_echo "Upgrading $base_version to the latest $install_version"
nvm install $install_version --reinstall-packages-from=$base_version
return $? return $?
;; ;;
"uninstall" ) "uninstall" )