From 9e154b159e6facf5a2911267a77ea8bd1df82ad3 Mon Sep 17 00:00:00 2001 From: Sayanee Date: Fri, 27 Feb 2015 09:49:45 +0800 Subject: [PATCH 1/5] fix: download url for iojs armv6l and armv7l. #678 #227 --- nvm.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 4b500c5..9fdfee7 100644 --- a/nvm.sh +++ b/nvm.sh @@ -859,7 +859,6 @@ nvm_get_arch() { case "$NVM_UNAME" in *x86_64*) NVM_ARCH=x64 ;; *i*86*) NVM_ARCH=x86 ;; - *armv6l*) NVM_ARCH=arm-pi ;; *) NVM_ARCH="$(uname -m)" ;; esac echo "$NVM_ARCH" From fb48129cd47d13bbb6a7fdb60c6e801ac09fa875 Mon Sep 17 00:00:00 2001 From: Sayanee Date: Sat, 28 Feb 2015 14:48:38 +0800 Subject: [PATCH 2/5] add support for node builds for armv6l named as arm-pi --- nvm.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 nvm.sh diff --git a/nvm.sh b/nvm.sh old mode 100644 new mode 100755 index 9fdfee7..da7cef0 --- a/nvm.sh +++ b/nvm.sh @@ -936,7 +936,11 @@ nvm_install_node_binary() { if [ -n "$NVM_OS" ]; then if nvm_binary_available "$VERSION"; then - t="$VERSION-$NVM_OS-$(nvm_get_arch)" + nvm_arch="$(nvm_get_arch)" + if [ $nvm_arch = "armv6l" ]; then + nvm_arch="arm-pi" + fi + t="$VERSION-$NVM_OS-$nvm_arch" url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz" sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | command grep node-${t}.tar.gz | command awk '{print $1}'` local tmpdir From f8ee25ab5bbb2ddd439c210542ef736cb55283c6 Mon Sep 17 00:00:00 2001 From: Sayanee Date: Mon, 2 Mar 2015 01:04:29 +0800 Subject: [PATCH 3/5] fix: local declaration of ksh compatibility --- nvm.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index da7cef0..317c28f 100755 --- a/nvm.sh +++ b/nvm.sh @@ -936,7 +936,8 @@ nvm_install_node_binary() { if [ -n "$NVM_OS" ]; then if nvm_binary_available "$VERSION"; then - nvm_arch="$(nvm_get_arch)" + local NVM_ARCH + NVM_ARCH="$(nvm_get_arch)" if [ $nvm_arch = "armv6l" ]; then nvm_arch="arm-pi" fi From f8064b259d6ba6c1f4f0b498f43bc90c55daee3b Mon Sep 17 00:00:00 2001 From: Sayanee Date: Mon, 2 Mar 2015 12:19:34 +0800 Subject: [PATCH 4/5] fix: if case and capitalising variable --- nvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index 317c28f..de5f2b2 100755 --- a/nvm.sh +++ b/nvm.sh @@ -938,8 +938,8 @@ nvm_install_node_binary() { if nvm_binary_available "$VERSION"; then local NVM_ARCH NVM_ARCH="$(nvm_get_arch)" - if [ $nvm_arch = "armv6l" ]; then - nvm_arch="arm-pi" + if [ $NVM_ARCH == "armv6l" ]; then + NVM_ARCH="arm-pi" fi t="$VERSION-$NVM_OS-$nvm_arch" url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz" From 16a730f4cc5e3dd4bc77cd48b9667829f9fbe707 Mon Sep 17 00:00:00 2001 From: Sayanee Date: Mon, 2 Mar 2015 12:28:21 +0800 Subject: [PATCH 5/5] amend all variables nvm_arch to capitalise --- nvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index de5f2b2..daaaae3 100755 --- a/nvm.sh +++ b/nvm.sh @@ -938,10 +938,10 @@ nvm_install_node_binary() { if nvm_binary_available "$VERSION"; then local NVM_ARCH NVM_ARCH="$(nvm_get_arch)" - if [ $NVM_ARCH == "armv6l" ]; then + if [ $NVM_ARCH = "armv6l" ]; then NVM_ARCH="arm-pi" fi - t="$VERSION-$NVM_OS-$nvm_arch" + t="$VERSION-$NVM_OS-$NVM_ARCH" url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz" sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | command grep node-${t}.tar.gz | command awk '{print $1}'` local tmpdir