From 5a9393d5da5b50232fdf055c5d335e6b0ce252cc Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 16 Mar 2013 09:46:35 +0100 Subject: [PATCH] Update version checks --- bin/installDeps.sh | 4 ++-- bin/installOnWindows.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 9763f41ba..2f97090b7 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -44,8 +44,8 @@ fi #check node version NODE_VERSION=$(node --version) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) -if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" ]; then - echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x or v0.8.x" >&2 +if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" && [ ! $NODE_V_MINOR = "v0.10" ]; then + echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x, v0.8.x or v0.10.x" >&2 exit 1 fi diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat index f678672b1..f74529829 100644 --- a/bin/installOnWindows.bat +++ b/bin/installOnWindows.bat @@ -8,7 +8,7 @@ cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && ex echo _ echo Checking node version... -set check_version="if(['6','8'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x or v0.8.x'); process.exit(1) }" +set check_version="if(['6','8','10'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x, v0.8.x or v0.10.x'); process.exit(1) }" cmd /C node -e %check_version% || exit /B 1 echo _