From 85ec3eb7f37d71be99566c6c5c43f0f8a80b9b09 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 26 Apr 2017 22:32:33 +0200 Subject: Remove Node 4 support --- .travis.yml | 1 - README.md | 5 ++--- scripts/upgrade.sh | 14 +++++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76efedd50..068067796 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: node_js node_js: - - "4" - "6" env: diff --git a/README.md b/README.md index 750522dd6..6e54e5bdb 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ See [wiki](https://github.com/Chocobozzz/PeerTube/wiki) for complete installatio ### Dependencies - * **NodeJS >= 4.x** + * **NodeJS >= 6.x** * **npm >= 3.x** * OpenSSL (cli) * PostgreSQL @@ -129,13 +129,12 @@ See [wiki](https://github.com/Chocobozzz/PeerTube/wiki) for complete installatio #### Debian - * Install NodeJS 4.x (actual LTS): [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) + * Install NodeJS 6.x (actual LTS): [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) * Add jessie backports to your *source.list*: http://backports.debian.org/Instructions/ * Run: # apt-get update # apt-get install ffmpeg postgresql-9.4 openssl - # npm install -g npm@3 #### Other distribution... (PR welcome) diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 022e76107..59deae1eb 100755 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -1,13 +1,25 @@ #!/usr/bin/env sh +nodeMinVersion="v6.0.0" +npmMinVersion="3.0.0" -git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1 +if [[ $(node --version) < $nodeMinVersion ]]; then + echo 'You need node >= 6' + exit 0 +fi + +if [[ $(npm --version) < $npmMinVersion ]]; then + echo 'You need npm >= 3' + exit 0 +fi if pgrep peertube > /dev/null; then echo 'PeerTube is running!' exit 0 fi +git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1 + npm install npm update cd client && npm update && cd ../ -- cgit v1.2.3