From 423629c38b6e20df490727ab4020c1655836379d Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 18 Jul 2014 14:13:47 +0200 Subject: [PATCH 1/2] add test without curl --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36fbc86..1709004 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: c # defaults to ruby install: - sudo apt-get install ksh zsh -y + - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y' before_script: - - curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin + - '[ -n "$WITHOUT_CURL" ] || curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin' + - '[ -z "$WITHOUT_CURL" ] || wget -O /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin' + - chmod +x /tmp/urchin script: - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL env: @@ -12,3 +15,4 @@ env: - SHELL=zsh TEST_SUITE=fast - SHELL=ksh TEST_SUITE=fast - SHELL=sh TEST_SUITE=slow + - SHELL=sh TEST_SUITE=fast WITHOUT_CURL=1 From d67f2b110d39e2ec50b9cb69cbb5e90adab3ec70 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 18 Jul 2014 16:18:17 +0200 Subject: [PATCH 2/2] string replacement turns out not POSIX compliant --- install.sh | 13 ++++++------- nvm.sh | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/install.sh b/install.sh index eb45d73..d87137f 100755 --- a/install.sh +++ b/install.sh @@ -16,13 +16,12 @@ nvm_download() { curl $* elif nvm_has "wget"; then # Emulate curl with wget - ARGS="$*" - ARGS=${ARGS/--progress-bar /--progress=bar } - ARGS=${ARGS/-L /} - ARGS=${ARGS/-I /} - ARGS=${ARGS/-s /-q } - ARGS=${ARGS/-o /-O } - ARGS=${ARGS/-C - /-c } + ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \ + -e 's/-L //' \ + -e 's/-I //' \ + -e 's/-s /-q /' \ + -e 's/-o /-O /' \ + -e 's/-C - /-c /') wget $ARGS fi } diff --git a/nvm.sh b/nvm.sh index 6952224..1197059 100644 --- a/nvm.sh +++ b/nvm.sh @@ -17,13 +17,12 @@ nvm_download() { curl $* elif nvm_has "wget"; then # Emulate curl with wget - ARGS="$*" - ARGS=${ARGS/--progress-bar /--progress=bar } - ARGS=${ARGS/-L /} - ARGS=${ARGS/-I /} - ARGS=${ARGS/-s /-q } - ARGS=${ARGS/-o /-O } - ARGS=${ARGS/-C - /-c } + ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \ + -e 's/-L //' \ + -e 's/-I //' \ + -e 's/-s /-q /' \ + -e 's/-o /-O /' \ + -e 's/-C - /-c /') wget $ARGS fi }