From ecb7a15baaf422fb2a268e77bb998ebd5c591426 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 31 Jan 2014 10:00:19 -0800 Subject: [PATCH] Using our conventional NVM_ prefix for env vars. Per https://github.com/creationix/nvm/pull/245#issuecomment-33821443 --- README.markdown | 6 ++++-- nvm.sh | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.markdown b/README.markdown index cf96406..fb0f486 100644 --- a/README.markdown +++ b/README.markdown @@ -66,11 +66,13 @@ To set a default Node version to be used in any new shell, use the alias 'defaul nvm alias default 0.10 -To use a mirror of the node binaries, set `$NODEJS_MIRROR`: +To use a mirror of the node binaries, set `$NVM_NODEJS_ORG_MIRROR`: - export NODEJS_MIRROR=http://nodejs.org/dist + export NVM_NODEJS_ORG_MIRROR=http://nodejs.org/dist nvm install 0.10 + NVM_NODEJS_ORG_MIRROR=http://nodejs.org/dist nvm install 0.10 + ## License nvm is released under the MIT license. diff --git a/nvm.sh b/nvm.sh index cdb8641..272fc79 100755 --- a/nvm.sh +++ b/nvm.sh @@ -25,8 +25,8 @@ if [ ! -d "$NVM_DIR" ]; then fi # Setup mirror location if not already set -if [ -z "$NODEJS_MIRROR" ]; then - export NODEJS_MIRROR="http://nodejs.org/dist" +if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then + export NVM_NODEJS_ORG_MIRROR="http://nodejs.org/dist" fi nvm_set_nullglob() { @@ -110,7 +110,7 @@ nvm_ls_remote() { else PATTERN=".*" fi - VERSIONS=`curl -s $NODEJS_MIRROR/ \ + VERSIONS=`curl -s $NVM_NODEJS_ORG_MIRROR/ \ | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \ | \grep -w "${PATTERN}" \ | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n` @@ -267,8 +267,8 @@ nvm() { esac if [ $binavail -eq 1 ]; then t="$VERSION-$os-$arch" - url="$NODEJS_MIRROR/$VERSION/node-${t}.tar.gz" - sum=`curl -s $NODEJS_MIRROR/$VERSION/SHASUMS.txt | \grep node-${t}.tar.gz | awk '{print $1}'` + url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz" + sum=`curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-${t}.tar.gz | awk '{print $1}'` local tmpdir="$NVM_DIR/bin/node-${t}" local tmptarball="$tmpdir/node-${t}.tar.gz" if ( @@ -300,11 +300,11 @@ nvm() { fi local tmpdir="$NVM_DIR/src" local tmptarball="$tmpdir/node-$VERSION.tar.gz" - if [ "`curl -Is "$NODEJS_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then - tarball="$NODEJS_MIRROR/$VERSION/node-$VERSION.tar.gz" - sum=`curl -s $NODEJS_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'` - elif [ "`curl -Is "$NODEJS_MIRROR/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then - tarball="$NODEJS_MIRROR/node-$VERSION.tar.gz" + if [ "`curl -Is "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then + tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" + sum=`curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'` + elif [ "`curl -Is "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then + tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" fi if ( [ ! -z $tarball ] && \