summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorfurylynx <furylynx@users.noreply.github.com>2018-07-21 16:41:06 +0200
committerfurylynx <furylynx@users.noreply.github.com>2018-07-21 16:41:06 +0200
commit278531370618a72d0a4c0a43c64ab3231b02e2cd (patch)
tree390534b412535818a0fe262588284a8a68bf160a /Tools
parent1cbabb2e06a2937d4d7b5f50e28361467c134994 (diff)
downloadswig-278531370618a72d0a4c0a43c64ab3231b02e2cd.tar.gz
node tests: use provided version if present
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/travis-linux-install.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index 75e3ddbc4..7aeb12ada 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -37,10 +37,14 @@ case "$SWIGLANG" in
"javascript")
case "$ENGINE" in
"node")
- travis_retry wget -qO- https://raw.githubusercontent.com/xtuple/nvm/master/install.sh | sudo bash
- travis_retry sudo nvm install ${VER}
- sudo nvm use ${VER}
- travis_retry npm install -g node-gyp
+ if [[ -z "$VER" ]]; then
+ travis_retry sudo apt-get install -qq nodejs node-gyp
+ else
+ travis_retry wget -qO- https://raw.githubusercontent.com/xtuple/nvm/master/install.sh | sudo bash
+ travis_retry sudo nvm install ${VER}
+ sudo nvm use ${VER}
+ travis_retry npm install -g node-gyp
+ fi
;;
"jsc")
travis_retry sudo apt-get install -qq libwebkitgtk-dev