From 27494b4b1a33d2c75f13bd8205ba58fe27ac1be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Mon, 13 Jan 2014 09:16:28 +0100 Subject: [PATCH 1/4] Use 'read' built-in instead of $(cat ... | head -n1) --- nvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 4d8aac4..762f7b5 100644 --- a/nvm.sh +++ b/nvm.sh @@ -74,7 +74,7 @@ nvm_rc_version() { local NVMRC_PATH NVMRC_PATH="$(nvm_find_nvmrc)" if [ -e "$NVMRC_PATH" ]; then - NVM_RC_VERSION=`cat "$NVMRC_PATH" | head -n 1` + read NVM_RC_VERSION < "$NVMRC_PATH" echo "Found '$NVMRC_PATH' with version <$NVM_RC_VERSION>" fi } From b0936bf2b15ce27f4e586ac718e797f950325f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Mon, 20 Jan 2014 00:59:25 +0100 Subject: [PATCH 2/4] Remove redundant 'return $?' --- nvm.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 762f7b5..c8739a9 100644 --- a/nvm.sh +++ b/nvm.sh @@ -9,7 +9,6 @@ NVM_SCRIPT_SOURCE="$_" nvm_has() { type "$1" > /dev/null 2>&1 - return $? } nvm_download() { From f6796075f39779ccce4a5ce88efa0b28788aa354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Mon, 20 Jan 2014 19:54:50 +0100 Subject: [PATCH 3/4] Use shell built-in matching instead of 'expr' external --- nvm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nvm.sh b/nvm.sh index c8739a9..70b4966 100644 --- a/nvm.sh +++ b/nvm.sh @@ -428,10 +428,10 @@ nvm() { nvm use $VERSION if ! nvm_has "npm" ; then echo "Installing npm..." - if [ "`expr "$VERSION" : '\(^v0\.1\.\)'`" != '' ]; then + if [[ $VERSION == v0.1.* ]]; then echo "npm requires node v0.2.3 or higher" >&2 - elif [ "`expr "$VERSION" : '\(^v0\.2\.\)'`" != '' ]; then - if [ "`expr "$VERSION" : '\(^v0\.2\.[0-2]$\)'`" != '' ]; then + elif [[ $VERSION == v0.2.* ]]; then + if [[ $VERSION == v0.2.[0-2] ]]; then echo "npm requires node v0.2.3 or higher" >&2 else nvm_download https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh From b641675dbe48d4068cb0975da14e86c81c694646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Mon, 20 Jan 2014 19:58:30 +0100 Subject: [PATCH 4/4] Refactor npm install --- nvm.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nvm.sh b/nvm.sh index 70b4966..7d78633 100644 --- a/nvm.sh +++ b/nvm.sh @@ -428,14 +428,10 @@ nvm() { nvm use $VERSION if ! nvm_has "npm" ; then echo "Installing npm..." - if [[ $VERSION == v0.1.* ]]; then + if [[ $VERSION == v0.1.* || $VERSION == v0.2.[0-2] ]]; then echo "npm requires node v0.2.3 or higher" >&2 elif [[ $VERSION == v0.2.* ]]; then - if [[ $VERSION == v0.2.[0-2] ]]; then - echo "npm requires node v0.2.3 or higher" >&2 - else - nvm_download https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh - fi + nvm_download https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh else nvm_download https://npmjs.org/install.sh -o - | clean=yes sh fi