Merge remote-tracking branch 'creationix/master' into install-fix-quotes

Dave May 2015-12-28 12:08:57 -05:00
commit 00d4520d35
4 changed files with 6 additions and 6 deletions

View File

@ -25,11 +25,11 @@ Homebrew installation is not supported.
To install or update nvm, you can use the [install script][2] using cURL:
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.29.0/install.sh | bash
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.0/install.sh | bash
or Wget:
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.29.0/install.sh | bash
wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.30.0/install.sh | bash
<sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
@ -254,7 +254,7 @@ After the v0.8.6 release of node, nvm tries to install from binary packages. But
If setting the `default` alias does not establish the node version in new shells (i.e. `nvm current` yields `system`), ensure that the system's node PATH is set before the `nvm.sh` source line in your shell profile (see [#658](https://github.com/creationix/nvm/issues/658))
[1]: https://github.com/creationix/nvm.git
[2]: https://github.com/creationix/nvm/blob/v0.29.0/install.sh
[2]: https://github.com/creationix/nvm/blob/v0.30.0/install.sh
[3]: https://travis-ci.org/creationix/nvm
[Urchin]: https://github.com/scraperwiki/urchin
[Fish]: http://fishshell.com

View File

@ -11,7 +11,7 @@ if [ -z "$NVM_DIR" ]; then
fi
nvm_latest_version() {
echo "v0.29.0"
echo "v0.30.0"
}
#

2
nvm.sh
View File

@ -2279,7 +2279,7 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
nvm_remote_version "$2"
;;
"--version" )
echo "0.29.0"
echo "0.30.0"
;;
"unload" )
unset -f nvm nvm_print_versions nvm_checksum \

View File

@ -1,6 +1,6 @@
{
"name": "nvm",
"version": "0.29.0",
"version": "0.30.0",
"description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
"directories": {
"test": "test"