Merge remote-tracking branch 'upstream/master'

Conflicts:
	bash_completion
master
mikedeboer 2012-10-17 18:51:53 +02:00
commit ab16d34012
2 changed files with 3 additions and 3 deletions

4
nvm.sh
View File

@ -215,7 +215,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 - --progress-bar $tarball -o "node-$VERSION.tar.gz" && \ curl --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" $ADDITIONAL_PARAMETERS && \ ./configure --prefix="$NVM_DIR/$VERSION" $ADDITIONAL_PARAMETERS && \
@ -406,4 +406,4 @@ nvm()
esac esac
} }
nvm ls default >/dev/null 2>&1 && nvm use default >/dev/null nvm ls default &>/dev/null && nvm use default >/dev/null || true