From d341d5e5350451b94f679821ef1b7726a621a459 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 8 Aug 2014 12:16:22 -0700 Subject: [PATCH 1/3] Run all slow tests on all shells --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index c5581db..ba1b1bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,3 +20,10 @@ env: - SHELL=ksh TEST_SUITE=fast - SHELL=ksh TEST_SUITE=fast WITHOUT_CURL=1 - SHELL=sh TEST_SUITE=slow + - SHELL=sh TEST_SUITE=slow WITHOUT_CURL=1 + - SHELL=dash TEST_SUITE=slow + - SHELL=dash TEST_SUITE=slow WITHOUT_CURL=1 + - SHELL=bash TEST_SUITE=slow + - SHELL=bash TEST_SUITE=slow WITHOUT_CURL=1 + - SHELL=zsh TEST_SUITE=slow + - SHELL=zsh TEST_SUITE=slow WITHOUT_CURL=1 From 708ac80a5555b535a0bf3d1be2df6082cfe276da Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 15 Aug 2014 20:21:46 -0700 Subject: [PATCH 2/3] Properly replace the -I curl option for the --server-response wget option. --- install.sh | 2 +- nvm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index d7c6261..53459f7 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,7 @@ nvm_download() { # Emulate curl with wget ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \ -e 's/-L //' \ - -e 's/-I //' \ + -e 's/-I /--server-response /' \ -e 's/-s /-q /' \ -e 's/-o /-O /' \ -e 's/-C - /-c /') diff --git a/nvm.sh b/nvm.sh index fee0758..781f2b5 100644 --- a/nvm.sh +++ b/nvm.sh @@ -19,7 +19,7 @@ nvm_download() { # Emulate curl with wget ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \ -e 's/-L //' \ - -e 's/-I //' \ + -e 's/-I /--server-response /' \ -e 's/-s /-q /' \ -e 's/-o /-O /' \ -e 's/-C - /-c /') From d7849054f81627e02e5aabfbeddf38faa40fcf0f Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 15 Aug 2014 20:29:01 -0700 Subject: [PATCH 3/3] Apparently wget outputs to stderr, so let's make sure we're checking both stderr and stdout. --- nvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvm.sh b/nvm.sh index 781f2b5..aa46581 100644 --- a/nvm.sh +++ b/nvm.sh @@ -449,7 +449,7 @@ nvm() { tmpdir="$NVM_DIR/src" local tmptarball tmptarball="$tmpdir/node-$VERSION.tar.gz" - if [ "`nvm_download -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then + if [ "`nvm_download -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - 2>&1 | \grep '200 OK'`" != '' ]; then tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" sum=`nvm_download -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-$VERSION.tar.gz | \awk '{print $1}'` elif [ "`nvm_download -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then