- version detection now works with zsh

- curl routine now compatible with zsh
- changed curl to use --progress-bar instead of unsafe shorthand (-#)
master
Geoffrey Huntley 2011-08-25 14:03:13 +10:00
parent 2ecd1fac63
commit 1251684440
1 changed files with 2 additions and 2 deletions

4
nvm.sh
View File

@ -56,7 +56,7 @@ nvm_version()
return return
fi fi
if [ ! "$VERSION" ]; then if [ ! "$VERSION" ]; then
VERSION=`(cd $NVM_DIR; \ls -d v${PATTERN}* 2>/dev/null) | sort -t. -k 2,1n -k 2,2n -k 3,3n | tail -n1` VERSION=`(cd $NVM_DIR; \ls -d v${~PATTERN}* 2>/dev/null) | sort -t. -k 2,1n -k 2,2n -k 3,3n | tail -n1`
fi fi
if [ ! "$VERSION" ]; then if [ ! "$VERSION" ]; then
echo "N/A" echo "N/A"
@ -118,7 +118,7 @@ nvm()
[ ! -z $tarball ] && \ [ ! -z $tarball ] && \
mkdir -p "$NVM_DIR/src" && \ mkdir -p "$NVM_DIR/src" && \
cd "$NVM_DIR/src" && \ cd "$NVM_DIR/src" && \
curl -C - -# $tarball -o "node-$VERSION.tar.gz" && \ curl -C - --progress-bar $tarball -o "node-$VERSION.tar.gz" && \
tar -xzf "node-$VERSION.tar.gz" && \ tar -xzf "node-$VERSION.tar.gz" && \
cd "node-$VERSION" && \ cd "node-$VERSION" && \
./configure --prefix="$NVM_DIR/$VERSION" && \ ./configure --prefix="$NVM_DIR/$VERSION" && \