diff options
| author | John McLear <john@mclear.co.uk> | 2014-09-27 11:35:39 +0100 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-09-27 11:35:39 +0100 |
| commit | 2e6348b8aa7f02c9fd5203f5e90feb148e47661f (patch) | |
| tree | 801bbe025504cf862db8b0153bc9f317a544d03b | |
| parent | d3b45ef2c96a399ebe901d39d5eada9fa5d543e0 (diff) | |
| parent | 94968e69be03a78f6202b83fc958be292244f677 (diff) | |
| download | etherpad-lite-2e6348b8aa7f02c9fd5203f5e90feb148e47661f.zip | |
Merge pull request #2249 from Gared/support_npm2
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 |