From: Chocobozzz <me@florianbigard.com>
Date: Mon, 15 Jan 2018 17:23:17 +0000 (+0100)
Subject: Remove npm run upgrade
X-Git-Tag: v0.0.11-alpha~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d13b29965482cebfd2070d5acf010af75416925;p=oweals%2Fpeertube.git

Remove npm run upgrade

Use command from production.md instead
---

diff --git a/package.json b/package.json
index ba05dcc61..05c5f46b9 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,6 @@
     "dev:server": "scripty",
     "dev:client": "scripty",
     "start": "node dist/server",
-    "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
deleted file mode 100755
index bfef38264..000000000
--- a/scripts/upgrade-peertube.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-verlte() {
-  [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
-}
-
-nodeMinVersion="8.0.0"
-npmMinVersion="3.0.0"
-
-actualNodeVersion=$(node --version | tr -d "v")
-actualNpmVersion=$(npm --version)
-
-if verlte $actualNodeVersion $nodeMinVersion; then
-  echo 'You need node >= 8'
-  exit 0
-fi
-
-if verlte $actualNpmVersion $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, please shut it off before upgrading'
-  exit 0
-fi
-
-git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1
-
-yarn install --pure-lockfile
-npm run build
-
-echo -e "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts."
diff --git a/support/doc/production.md b/support/doc/production.md
index 77c9a086d..af137fe9a 100644
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -26,17 +26,14 @@ $ sudo -u postgres createdb -O peertube peertube_prod
 
 ### Prepare PeerTube directory
 
-Check the latest release: https://github.com/Chocobozzz/PeerTube/releases or the release version you want.
-We assume in the following commands the version is 0.42.42:
-
 ```
-$ VERSION="0.42.42" && \
+$ VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4) && \
     cd /home/peertube && \
     sudo -u peertube mkdir config storage versions && \
     cd versions && \
-    sudo -u peertube wget "https://github.com/Chocobozzz/PeerTube/releases/download/v${VERSION}/peertube-v${VERSION}.zip" && \
-    sudo -u peertube unzip peertube-v${VERSION}.zip && sudo -u peertube rm peertube-v${VERSION}.zip && \
-    cd ../ && sudo -u peertube ln -s versions/peertube-v${VERSION} ./peertube-latest && \
+    sudo -u peertube wget "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip" && \
+    sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip && \
+    cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest && \
     cd ./peertube-latest && sudo -u peertube yarn install --production --pure-lockfile
 ```
 
@@ -227,11 +224,12 @@ $ NODE_ENV=production npm run reset-password -- -u root
 
 ## Upgrade
 
-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-peertube
-# systemctl start peertube
+$ VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4) && \
+    cd /home/peertube/versions && \
+    sudo -u peertube wget "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip" && \
+    sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip && \
+    cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest && \
+    cd ./peertube-latest && sudo -u peertube yarn install --production --pure-lockfile && \
+    sudo systemctl restart peertube
 ```