diff options
| author | Stefan <mu.stefan@googlemail.com> | 2014-09-27 12:30:11 +0200 |
|---|---|---|
| committer | Stefan <mu.stefan@googlemail.com> | 2014-09-27 12:30:11 +0200 |
| commit | 94968e69be03a78f6202b83fc958be292244f677 (patch) | |
| tree | 7d5e9f04d7c0064b7db4d1dd78f026754190268c | |
| parent | e34a4ea4ee5939d0e38436299793793763b198be (diff) | |
| download | etherpad-lite-94968e69be03a78f6202b83fc958be292244f677.zip | |
Add support for npm 2
| -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 84f2e227..a8bc88a8 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -36,8 +36,9 @@ hash npm > /dev/null 2>&1 || { #check npm version NPM_VERSION=$(npm --version) -if [ ! $(echo $NPM_VERSION | cut -d "." -f 1) = "1" ]; then - echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x" >&2 +NPM_MAIN_VERSION=$(echo $NPM_VERSION | cut -d "." -f 1) +if [ $(echo $NPM_MAIN_VERSION) = "0" ]; then + echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x or higher" >&2 exit 1 fi |