diff options
| author | Stefan <mu.stefan@googlemail.com> | 2015-09-26 12:15:54 +0200 |
|---|---|---|
| committer | Stefan <mu.stefan@googlemail.com> | 2015-09-26 12:15:54 +0200 |
| commit | bf7930fccb37ac6d2b40115ff41c2c0b70fb1061 (patch) | |
| tree | 9e37b8c3d3cf0e8a34e7916a5a59b23b1376f0df /bin | |
| parent | 7170a6a8cb9d3a8f186ebbe8782c3ab2782b4dee (diff) | |
| download | etherpad-lite-bf7930fccb37ac6d2b40115ff41c2c0b70fb1061.zip | |
Support version 4 of node.js
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/installDeps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/installDeps.sh b/bin/installDeps.sh index f2a3aafc..fbbbbb24 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -46,13 +46,14 @@ fi #check node version 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) #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" ]; then +if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN = "v4" ]; 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 v0.10.x, v0.11.x or v0.12.x" >&2 + 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 fi |