From fab5db0ec817688aa3e87253358efc435b6c60e6 Mon Sep 17 00:00:00 2001 From: Kieran Huggins Date: Wed, 27 Jul 2011 17:50:41 -0400 Subject: [PATCH] add support for release directories ( e.g. >= v0.5.1 ) --- nvm.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index 39c950e..975d482 100644 --- a/nvm.sh +++ b/nvm.sh @@ -105,10 +105,17 @@ nvm() fi [ "$NOCURL" ] && curl && return VERSION=`nvm_version $2` + export tarball='' + if [ "`curl -Is "http://nodejs.org/dist/$VERSION/node-$VERSION.tar.gz" | grep '200 OK'`" != '' ]; then + export tarball="http://nodejs.org/dist/$VERSION/node-$VERSION.tar.gz" + elif [ "`curl -Is "http://nodejs.org/dist/node-$VERSION.tar.gz" | grep '200 OK'`" != '' ]; then + export tarball="http://nodejs.org/dist/node-$VERSION.tar.gz" + fi if ( + [ ! -z $tarball ] && \ mkdir -p "$NVM_DIR/src" && \ cd "$NVM_DIR/src" && \ - curl -C - -# "http://nodejs.org/dist/node-$VERSION.tar.gz" -o "node-$VERSION.tar.gz" && \ + curl -C - -# $tarball -o "node-$VERSION.tar.gz" && \ tar -xzf "node-$VERSION.tar.gz" && \ cd "node-$VERSION" && \ ./configure --prefix="$NVM_DIR/$VERSION" && \ @@ -220,7 +227,7 @@ nvm() (cd $NVM_DIR rm -f v* 2>/dev/null printf "# syncing with nodejs.org..." - for VER in `curl -s http://nodejs.org/dist/ -o - | grep 'node-v.*\.tar\.gz' | sed -e 's/.*node-//' -e 's/\.tar\.gz.*//'`; do + for VER in `curl -s http://nodejs.org/dist/ -o - | grep 'v[0-9].*' | sed -e 's/.*node-//' -e 's/\.tar\.gz.*//' -e 's/<[^>]*>//' -e 's/\/<[^>]*>.*//'`; do touch $VER done echo " done."