From 4c032e6b5e2cbf297ef68bddeb18a6cd4e1cc933 Mon Sep 17 00:00:00 2001
From: Martin Winkler <efelon@winklerfamilie.eu>
Date: Thu, 17 Feb 2022 08:40:10 +0100
Subject: [PATCH] Friendica root sanity check and small info enhancement

---
 seqs/friendica.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/seqs/friendica.sh b/seqs/friendica.sh
index b314645..99833d0 100755
--- a/seqs/friendica.sh
+++ b/seqs/friendica.sh
@@ -17,8 +17,10 @@ step_config() {
   fi
 }
 
-step_20_info() { 
-  echo -n "Create a backup [FRIENDICA ROOT]"
+step_20_info() {
+  shift
+  echoinfoArgs "[FRIENDICA ROOT]"
+  echo -n "Create a backup"
   if [ $CONFIG -ne 0 ] ; then
     echo " at $FR_BACKUP"
   else
@@ -36,13 +38,17 @@ step_20() {
   if [ ! -z $FR_BACKUP ] ; then
     exe mkdir -p "$FR_BACKUP"
   fi
-  if [ ! -z $1 ] ; then
+  if [ ! -z "$1" ] ; then
     tempRoot="$1"
   else
     tempRoot="$FR_LOC"
   fi
 
   exe $WDIR/mysql.sh -qq backup "$FR_DATABASE" "$FR_BACKUP"
+  endReturn -o $? "Backup mysql database failed"
+
+  [ ! -e "$tempRoot" ] && endReturn -o 1 -f "Friendica root $tempRoot not found"
+
   local wwwBackup="$FR_BACKUP/${toolName}_www_`date +%Y%m%d-%H%M%S`.tar.gz"
   local dataBackup="$FR_BACKUP/${toolName}_data_`date +%Y%m%d-%H%M%S`.tar.gz"
   echo " [I] Backing up webserver directory to $wwwBackup"
@@ -162,5 +168,5 @@ step_24() {
   exe rm -rf "$tempDown"
 }
 
-VERSION_SEQREV=11
+VERSION_SEQREV=14
 . /usr/local/bin/sequencer.sh