From 18d583d92d87827b93cd0afa84ce212cd179672c Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 20 Mar 2016 15:19:34 +0100 Subject: [PATCH 1/2] Check for node version 4 or higher and not special versions --- bin/installDeps.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index df6ea9fb..04aa0e53 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -47,11 +47,12 @@ fi NODE_VERSION=$(node --version) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1) +NODE_V_MAIN=${NODE_V_MAIN#"v"} #iojs version checking added if hash iojs 2>/dev/null; then IOJS_VERSION=$(iojs --version) fi -if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN = "v4" ] && [ ! $NODE_V_MAIN = "v5" ]; then +if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN -gt 4 ]; then if [ ! $IOJS_VERSION ]; then echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2 exit 1 From 2a81d2a57803b5ac1ff9f7c108dc619aa050f352 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 20 Mar 2016 15:21:56 +0100 Subject: [PATCH 2/2] Remove support for io.js --- bin/installDeps.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 04aa0e53..2e1d465d 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -48,15 +48,9 @@ NODE_VERSION=$(node --version) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1) NODE_V_MAIN=${NODE_V_MAIN#"v"} -#iojs version checking added -if hash iojs 2>/dev/null; then - IOJS_VERSION=$(iojs --version) -fi if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN -gt 4 ]; then - if [ ! $IOJS_VERSION ]; then - echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2 - exit 1 - fi + echo "You're running a wrong version of node. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2 + exit 1 fi #Get the name of the settings file