Using our conventional NVM_ prefix for env vars.

Per https://github.com/creationix/nvm/pull/245#issuecomment-33821443
master
Jordan Harband 2014-01-31 10:00:19 -08:00
parent 5f225cd625
commit ecb7a15baa
2 changed files with 14 additions and 12 deletions

View File

@ -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 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 install 0.10
NVM_NODEJS_ORG_MIRROR=http://nodejs.org/dist nvm install 0.10
## License ## License
nvm is released under the MIT license. nvm is released under the MIT license.

20
nvm.sh
View File

@ -25,8 +25,8 @@ if [ ! -d "$NVM_DIR" ]; then
fi fi
# Setup mirror location if not already set # Setup mirror location if not already set
if [ -z "$NODEJS_MIRROR" ]; then if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then
export NODEJS_MIRROR="http://nodejs.org/dist" export NVM_NODEJS_ORG_MIRROR="http://nodejs.org/dist"
fi fi
nvm_set_nullglob() { nvm_set_nullglob() {
@ -110,7 +110,7 @@ nvm_ls_remote() {
else else
PATTERN=".*" PATTERN=".*"
fi fi
VERSIONS=`curl -s $NODEJS_MIRROR/ \ VERSIONS=`curl -s $NVM_NODEJS_ORG_MIRROR/ \
| \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \ | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \
| \grep -w "${PATTERN}" \ | \grep -w "${PATTERN}" \
| sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n` | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
@ -267,8 +267,8 @@ nvm() {
esac esac
if [ $binavail -eq 1 ]; then if [ $binavail -eq 1 ]; then
t="$VERSION-$os-$arch" t="$VERSION-$os-$arch"
url="$NODEJS_MIRROR/$VERSION/node-${t}.tar.gz" url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
sum=`curl -s $NODEJS_MIRROR/$VERSION/SHASUMS.txt | \grep node-${t}.tar.gz | awk '{print $1}'` 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 tmpdir="$NVM_DIR/bin/node-${t}"
local tmptarball="$tmpdir/node-${t}.tar.gz" local tmptarball="$tmpdir/node-${t}.tar.gz"
if ( if (
@ -300,11 +300,11 @@ nvm() {
fi fi
local tmpdir="$NVM_DIR/src" local tmpdir="$NVM_DIR/src"
local tmptarball="$tmpdir/node-$VERSION.tar.gz" local tmptarball="$tmpdir/node-$VERSION.tar.gz"
if [ "`curl -Is "$NODEJS_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then if [ "`curl -Is "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then
tarball="$NODEJS_MIRROR/$VERSION/node-$VERSION.tar.gz" tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
sum=`curl -s $NODEJS_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'` sum=`curl -s $NVM_NODEJS_ORG_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 elif [ "`curl -Is "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then
tarball="$NODEJS_MIRROR/node-$VERSION.tar.gz" tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz"
fi fi
if ( if (
[ ! -z $tarball ] && \ [ ! -z $tarball ] && \