From db98f8cdaf420146c8a1b87740767feca01ec650 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 24 Apr 2018 14:39:46 -0700 Subject: [PATCH 1/2] [Fix] `install-latest-npm`: npm 6 is out, and requires node 6 or higher --- nvm.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index bf28b7d..db5f732 100644 --- a/nvm.sh +++ b/nvm.sh @@ -206,15 +206,29 @@ nvm_install_latest_npm() { NVM_IS_4_4_OR_BELOW=1 fi + local NVM_IS_5_OR_ABOVE + NVM_IS_5_OR_ABOVE=0 + if [ $NVM_IS_4_4_OR_BELOW -eq 0 ] && nvm_version_greater_than_or_equal_to "${NODE_VERSION}" 5.0.0; then + NVM_IS_5_OR_ABOVE=1 + fi + + local NVM_IS_6_OR_ABOVE + NVM_IS_6_OR_ABOVE=0 + if [ $NVM_IS_5_OR_ABOVE -eq 1 ] && nvm_version_greater_than_or_equal_to "${NODE_VERSION}" 6.0.0; then + NVM_IS_6_OR_ABOVE=1 + fi + if [ $NVM_IS_4_4_OR_BELOW -eq 1 ] || (\ - nvm_version_greater_than_or_equal_to "${NODE_VERSION}" 5.0.0 \ - && nvm_version_greater 5.10.0 "${NODE_VERSION}"\ + [ $NVM_IS_5_OR_ABOVE -eq 1 ] && nvm_version_greater 5.10.0 "${NODE_VERSION}"\ ); then nvm_echo '* `npm` `v5.3.x` is the last version that works on `node` 4.x versions below v4.4, or 5.x versions below v5.10, due to `Buffer.alloc`' $NVM_NPM_CMD install -g npm@5.3 elif [ $NVM_IS_4_4_OR_BELOW -eq 0 ] && nvm_version_greater 4.7.0 "${NODE_VERSION}"; then nvm_echo '* `npm` `v5.4.x` is the last version that works on `node` `v4.5` and `v4.6`' $NVM_NPM_CMD install -g npm@5.4 + elif [ $NVM_IS_6_OR_ABOVE -eq 0 ]; then + nvm_echo '* `npm` `v5.x` is the last version that works on `node` below `v6.0.0`' + $NVM_NPM_CMD install -g npm@5 else nvm_echo '* Installing latest `npm`; if this does not work on your node version, please report a bug!' $NVM_NPM_CMD install -g npm From 177a9673a791b47973e97f897a7c11aade6da8b6 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 24 Apr 2018 22:08:51 -0700 Subject: [PATCH 2/2] v0.33.10 --- README.md | 14 +++++++------- install.sh | 2 +- nvm.sh | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1bba03b..4bc78ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Node Version Manager [![Build Status](https://travis-ci.org/creationix/nvm.svg?branch=master)][3] [![nvm version](https://img.shields.io/badge/version-v0.33.9-yellow.svg)][4] [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/684/badge)](https://bestpractices.coreinfrastructure.org/projects/684) +# Node Version Manager [![Build Status](https://travis-ci.org/creationix/nvm.svg?branch=master)][3] [![nvm version](https://img.shields.io/badge/version-v0.33.10-yellow.svg)][4] [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/684/badge)](https://bestpractices.coreinfrastructure.org/projects/684) @@ -43,13 +43,13 @@ To install or update nvm, you can use the [install script][2] using cURL: ```sh -curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.9/install.sh | bash +curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash ``` or Wget: ```sh -wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.9/install.sh | bash +wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash ``` The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc`, `~/.profile`, or `~/.bashrc`). @@ -131,7 +131,7 @@ If you have `git` installed (requires git v1.7.10+): 1. clone this repo in the root of your user profile - `cd ~/` from anywhere then `git clone https://github.com/creationix/nvm.git .nvm` -2. `cd ~/.nvm` and check out the latest version with `git checkout v0.33.9` +2. `cd ~/.nvm` and check out the latest version with `git checkout v0.33.10` 3. activate nvm by sourcing it from your shell: `. nvm.sh` Now add these lines to your `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it automatically sourced upon login: @@ -497,7 +497,7 @@ If installing nvm on Alpine Linux *is* still what you want or need to do, you sh ```sh apk add -U curl bash ca-certificates openssl ncurses coreutils python2 make gcc g++ libgcc linux-headers grep util-linux binutils findutils -curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.9/install.sh | bash +curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash ``` The Node project has some desire but no concrete plans (due to the overheads of building, testing and support) to offer Alpine-compatible binaries. @@ -580,8 +580,8 @@ sudo chmod ugo-x /usr/libexec/path_helper More on this issue in [dotphiles/dotzsh](https://github.com/dotphiles/dotzsh#mac-os-x). [1]: https://github.com/creationix/nvm.git -[2]: https://github.com/creationix/nvm/blob/v0.33.9/install.sh +[2]: https://github.com/creationix/nvm/blob/v0.33.10/install.sh [3]: https://travis-ci.org/creationix/nvm -[4]: https://github.com/creationix/nvm/releases/tag/v0.33.9 +[4]: https://github.com/creationix/nvm/releases/tag/v0.33.10 [Urchin]: https://github.com/scraperwiki/urchin [Fish]: http://fishshell.com diff --git a/install.sh b/install.sh index c8ff156..96fa865 100755 --- a/install.sh +++ b/install.sh @@ -11,7 +11,7 @@ nvm_install_dir() { } nvm_latest_version() { - echo "v0.33.9" + echo "v0.33.10" } nvm_profile_is_bash_or_zsh() { diff --git a/nvm.sh b/nvm.sh index db5f732..5340990 100644 --- a/nvm.sh +++ b/nvm.sh @@ -3435,7 +3435,7 @@ nvm() { NVM_VERSION_ONLY=true NVM_LTS="${NVM_LTS-}" nvm_remote_version "${PATTERN:-node}" ;; "--version" ) - nvm_echo '0.33.9' + nvm_echo '0.33.10' ;; "unload" ) nvm deactivate >/dev/null 2>&1 diff --git a/package.json b/package.json index b04e553..a803019 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nvm", - "version": "0.33.9", + "version": "0.33.10", "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions", "directories": { "test": "test"