From 125168444021e7fc1d951e374a5a43abfe74f4ea Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Thu, 25 Aug 2011 14:03:13 +1000 Subject: [PATCH 1/2] - version detection now works with zsh - curl routine now compatible with zsh - changed curl to use --progress-bar instead of unsafe shorthand (-#) --- nvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index 9a34618..94564e8 100644 --- a/nvm.sh +++ b/nvm.sh @@ -56,7 +56,7 @@ nvm_version() return fi 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 if [ ! "$VERSION" ]; then echo "N/A" @@ -118,7 +118,7 @@ nvm() [ ! -z $tarball ] && \ mkdir -p "$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" && \ cd "node-$VERSION" && \ ./configure --prefix="$NVM_DIR/$VERSION" && \ From 964e7c303cdf3c55af61a9c641d606401968f0d4 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Thu, 25 Aug 2011 14:32:47 +1000 Subject: [PATCH 2/2] updated shorthand for -# to --progress-bar on wget emulation function() --- nvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 94564e8..b08444f 100644 --- a/nvm.sh +++ b/nvm.sh @@ -16,7 +16,7 @@ if [ ! `which curl` ]; then curl() { ARGS="$* " ARGS=${ARGS/-s /-q } - ARGS=${ARGS/-\# /} + ARGS=${ARGS/--progress-bar /} ARGS=${ARGS/-C - /-c } ARGS=${ARGS/-o /-O }