ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-05-10 22:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some more compatibility with zsh

Browse Source 
Prepend a v for version numbers if its not already there
This commit is contained in:
Koen Punt 2012-10-21 23:46:27 +02:00
parent 8cc5ea1ba8
commit 36c3c8fbc5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nvm.sh
View File

@ -36,8 +36,10 @@ nvm_version()
# The default version is the current one # The default version is the current one
if [ ! "$PATTERN" ]; then if [ ! "$PATTERN" ]; then
PATTERN='current' PATTERN='current'
else
PATTERN=`nvm_format_version $PATTERN`
fi fi
VERSION=`nvm_ls $PATTERN | tail -n1` VERSION=`nvm_ls $PATTERN | tail -n1`
echo "$VERSION" echo "$VERSION"
@ -61,6 +63,11 @@ nvm_normalize_version()
{ {
echo "$1" | sed -e 's/^v//' | awk -F. '{ printf("%d%03d%03d\n", $1,$2,$3); }'; echo "$1" | sed -e 's/^v//' | awk -F. '{ printf("%d%03d%03d\n", $1,$2,$3); }';
} }
nvm_format_version()
{
echo "$1" | sed -e 's/^\([0-9]\)/v\1/g'
}
nvm_binary_available() nvm_binary_available()
{ {
@ -87,7 +94,7 @@ nvm_ls()
return return
fi fi
# If it looks like an explicit version, don't do anything funny # If it looks like an explicit version, don't do anything funny
if [[ "$PATTERN" == v?*.?*.?* ]]; then if echo "$PATTERN" | grep 'v.*\..*\..*' ; then
VERSIONS="$PATTERN" VERSIONS="$PATTERN"
else else
VERSIONS=`(cd $NVM_DIR; \ls -d v${PATTERN}* 2>/dev/null) | sort -t. -k 1.2,1n -k 2,2n -k 3,3n` VERSIONS=`(cd $NVM_DIR; \ls -d v${PATTERN}* 2>/dev/null) | sort -t. -k 1.2,1n -k 2,2n -k 3,3n`
@ -104,9 +111,7 @@ nvm_ls_remote()
{ {
PATTERN=$1 PATTERN=$1
if [ "$PATTERN" ]; then if [ "$PATTERN" ]; then
if echo "${PATTERN}" | grep -v '^v' ; then PATTERN=`nvm_format_version "$PATTERN"`
PATTERN=v$PATTERN
fi
else else
PATTERN=".*" PATTERN=".*"
fi fi
@ -254,11 +259,12 @@ nvm()
;; ;;
"uninstall" ) "uninstall" )
[ $# -ne 2 ] && nvm help && return [ $# -ne 2 ] && nvm help && return
if [[ $2 == `nvm_version` ]]; then PATTERN=`nvm_format_version $2`
echo "nvm: Cannot uninstall currently-active node version, $2." if [[ $PATTERN == `nvm_version` ]]; then
echo "nvm: Cannot uninstall currently-active node version, $PATTERN."
return return
fi fi
VERSION=`nvm_version $2` VERSION=`nvm_version $PATTERN`
if [ ! -d $NVM_DIR/$VERSION ]; then if [ ! -d $NVM_DIR/$VERSION ]; then
echo "$VERSION version is not installed yet... installing" echo "$VERSION version is not installed yet... installing"
nvm install $VERSION nvm install $VERSION