fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2931 from Gared/improve_node_version_check 

Improve node version check
This commit is contained in:
John McLear 2016-03-26 22:09:53 +08:00
parent 9b1598d50c 2a81d2a578
commit b698927474
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/installDeps.sh
View File

@ -47,15 +47,10 @@ fi
NODE_VERSION=$(node --version) NODE_VERSION=$(node --version)
NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2)
NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1) NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1)
#iojs version checking added NODE_V_MAIN=${NODE_V_MAIN#"v"}
if hash iojs 2>/dev/null; then if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN -gt 4 ]; then
IOJS_VERSION=$(iojs --version) echo "You're running a wrong version of node. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2
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 [ ! $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 exit 1
fi
fi fi
#Get the name of the settings file #Get the name of the settings file