From: Chocobozzz Date: Sun, 25 Jun 2017 14:30:45 +0000 (+0200) Subject: Rename 'npm run upgrade' to 'npm run upgrade-peertube' X-Git-Tag: v0.0.1-alpha~388 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f133041819409a72cf70fa2fa6c4df14c6de4fd;p=oweals%2Fpeertube.git Rename 'npm run upgrade' to 'npm run upgrade-peertube' It was confusing with the command 'npm run update' --- diff --git a/README.md b/README.md index d7220b39f..c908d7bcb 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ You can check the application (CORS headers, tracker websocket...) by running: The following commands will upgrade the source (according to your current branch), upgrade node modules and rebuild client application: # systemctl stop peertube - $ npm run upgrade + $ npm run upgrade-peertube # systemctl start peertube ### Development diff --git a/package.json b/package.json index f795dff90..93193fe2f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,8 @@ "dev:client": "scripty", "start": "node dist/server", "check": "ts-node ./scripts/check.ts", - "upgrade": "scripty", + "upgrade-peertube": "scripty", + "upgrade": "echo 'This command was renamed to upgrade-peertube.'", "update-host": "ts-node ./scripts/update-host.ts", "test": "scripty", "help": "scripty", diff --git a/scripts/upgrade-peertube.sh b/scripts/upgrade-peertube.sh new file mode 100755 index 000000000..ff6dce94f --- /dev/null +++ b/scripts/upgrade-peertube.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +nodeMinVersion="v6.0.0" +npmMinVersion="3.0.0" + +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 ! which yarn > /dev/null; then + echo 'You need yarn' + 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 + +yarn install --pure-lockfile +npm run build + +echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh deleted file mode 100755 index ff6dce94f..000000000 --- a/scripts/upgrade.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -nodeMinVersion="v6.0.0" -npmMinVersion="3.0.0" - -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 ! which yarn > /dev/null; then - echo 'You need yarn' - 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 - -yarn install --pure-lockfile -npm run build - -echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts."