X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fupgrade.sh;h=e70576285bef4e30c8049b0b0a28ce6a56703fde;hb=92a6e85fe7679b47bb61f7ff6bc757c7ee75a440;hp=c70b3b42a8bdc608b1c3ea3961462de10135561a;hpb=d9d1989b62bed7eeed987d6def0ac8ccd6032c5e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index c70b3b42a..e70576285 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-PEERTUBE_PATH=${1:-/var/www/peertube/}
+PEERTUBE_PATH=${1:-/var/www/peertube}
 
 if [ ! -e "$PEERTUBE_PATH" ]; then
   echo "Error - path \"$PEERTUBE_PATH\" wasn't found"
@@ -20,16 +20,31 @@ if [ ! -e "$PEERTUBE_PATH/versions" -o ! -e "$PEERTUBE_PATH/config/production.ya
   exit 1
 fi
 
+if [ -x "$(command -v awk)" ] && [ -x "$(command -v sed)" ] ; then
+    REMAINING=$(df -k $PEERTUBE_PATH | awk '{ print $4}' | sed -n 2p)
+    ONE_GB=$((1024 * 1024))
+    if [ "$REMAINING" -lt "$ONE_GB" ]; then
+    echo "Error - not enough free space for upgrading"
+    echo ""
+    echo "Make sure you have at least 1 GB of free space in $PEERTUBE_PATH"
+    exit 1
+    fi
+fi
 
 # Backup database
-SQL_BACKUP_PATH="$PEERTUBE_PATH/backup/sql-peertube_prod-$(date +"%Y%m%d-%H%M").bak" 
-DB_USER=$(node -e "console.log(require('js-yaml').safeLoad(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['username'])")
-DB_PASS=$(node -e "console.log(require('js-yaml').safeLoad(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['password'])")
-DB_HOST=$(node -e "console.log(require('js-yaml').safeLoad(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['hostname'])")
-DB_SUFFIX=$(node -e "console.log(require('js-yaml').safeLoad(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['suffix'])")
-mkdir -p $PEERTUBE_PATH/backup
-
-PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -h $DB_HOST -F c "peertube${DB_SUFFIX}" -f "$SQL_BACKUP_PATH"
+if [ -x "$(command -v pg_dump)" ]
+then
+  SQL_BACKUP_PATH="$PEERTUBE_PATH/backup/sql-peertube_prod-$(date +"%Y%m%d-%H%M").bak"
+  DB_USER=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['username'])")
+  DB_PASS=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['password'])")
+  DB_HOST=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['hostname'])")
+  DB_SUFFIX=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['suffix'])")
+  DB_NAME=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['name'] || '')")
+  mkdir -p $PEERTUBE_PATH/backup
+  PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -h $DB_HOST -F c "${DB_NAME:-peertube${DB_SUFFIX}}" -f "$SQL_BACKUP_PATH"
+else
+  echo "pg_dump not found. Cannot make a SQL backup!"
+fi
 
 # If there is a pre-release, give the user a choice which one to install.
 RELEASE_VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4)
@@ -53,13 +68,20 @@ cd $PEERTUBE_PATH/versions
 unzip -o "peertube-${VERSION}.zip"
 rm -f "peertube-${VERSION}.zip"
 
-# Upgrade Scripts
+# Launch yarn to check if we have all required dependencies
+cd "$PEERTUBE_PATH/versions/peertube-${VERSION}"
+NOCLIENT=1 yarn install --production --pure-lockfile
+
+# Switch to latest code version
 rm -rf $PEERTUBE_PATH/peertube-latest
 ln -s "$PEERTUBE_PATH/versions/peertube-${VERSION}" $PEERTUBE_PATH/peertube-latest
-cd $PEERTUBE_PATH/peertube-latest
-yarn install --production --pure-lockfile 
 cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/default.yaml
 
 echo "Differences in configuration files..."
-diff -u $PEERTUBE_PATH/config/production.yaml "$PEERTUBE_PATH/versions/peertube-${VERSION}/config/production.yaml.example"
+cd $PEERTUBE_PATH/versions
+diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
 
+echo ""
+echo "==========================================="
+echo "==   Don’t forget to restart PeerTube!   =="
+echo "==========================================="