From f64717bab432e7f3d7031f958e0f86ba6ff7b261 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Tue, 6 Jul 2021 01:22:39 +0200
Subject: [PATCH] restore-website-from-backup.sh: fix some errors.

---
 bin/restore-website-from-backup.sh | 40 ++++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/bin/restore-website-from-backup.sh b/bin/restore-website-from-backup.sh
index 11f61c5..252c200 100755
--- a/bin/restore-website-from-backup.sh
+++ b/bin/restore-website-from-backup.sh
@@ -533,7 +533,7 @@ if $terminal && ! $BATCH_MODE ; then
    while ! $_OK ; do
    read _IN
       if is_number "$_IN" && [[ -n ${website_arr[$_IN]} ]]; then
-         WEBSITE=${website_arr[0]}
+         WEBSITE=${website_arr[$_IN]}
          _OK=true
       else
          echo ""
@@ -595,14 +595,14 @@ fi
 # --- Some final checks
 # =============
 
-if ! $(ls /backup/cl-fm.oopen.de/MySQL/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* > /dev/null 2>&1) ; then
-   if ! $(ls /backup/cl-fm.oopen.de/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* > /dev/null 2>&1) ; then
+if ! $(ls /backup/${SERVER}/MySQL/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* > /dev/null 2>&1) ; then
+   if ! $(ls /backup/${SERVER}/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* > /dev/null 2>&1) ; then
       fatal "No backuped database '${DATABASE_NAME} found!"
    else
-      SQL_FILE="$(ls /backup/cl-fm.oopen.de/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* | head -n 1)"
+      SQL_FILE="$(ls /backup/${SERVER}/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* | head -n 1)"
    fi
 else
-   SQL_FILE="$(ls /backup/cl-fm.oopen.de/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* | head -n 1)"
+   SQL_FILE="$(ls /backup/${SERVER}/MariaDB/${DATABASE_NAME}/${DATABASE_NAME}-${BACKUP_DATE}-* | head -n 1)"
 fi
 
 if [[ ! -d "$WEBSITE_BASE_DIR" ]]; then
@@ -618,32 +618,34 @@ if $terminal ; then
    echo -e "\033[1;32mRecover \033[1;37m${WEBSITE}\033[1;32m from \033[1;37m${BACKUP_DATE}\033[1;32m - Start with Parameters:"
    echo -e "\033[32m--\033[m"
    echo ""
-   echo -e   "   Website to restore...................: $WEBSITE"
+   echo -e   "   Server from which site will be restored....: $SERVER"
    echo ""
-   echo -e   "   Backup base directory................: $BACKUP_BASE_DIR"
-   echo -e   "   Local Website Base Directory.........: $LOCAL_WEBSITE_BASE_DIR"
+   echo -e   "   Website to restore.........................: $WEBSITE"
+   echo ""
+   echo -e   "   Backup base directory......................: $BACKUP_BASE_DIR"
+   echo -e   "   Local Website Base Directory...............: $LOCAL_WEBSITE_BASE_DIR"
    echo ""
    if $IS_NEXTCLOUD ; then
-      echo -e   "   Version of backuped nextcloud........: $NC_RESTORE_VERSION"
+      echo -e   "   Version of backuped nextcloud..............: $NC_RESTORE_VERSION"
       echo ""
    fi
-   echo -e   "   Backup Directory.....................: $BACKUP_DIR"
-   echo -e   "   Backup date .........................: $BACKUP_DATE"
+   echo -e   "   Backup Directory...........................: $BACKUP_DIR"
+   echo -e   "   Backup date ...............................: $BACKUP_DATE"
    echo ""
-   echo -e   "   Database type........................: $DATABASE_TYPE"
-   echo -e   "   Databse name.........................: $DATABASE_NAME"
-   echo -e   "   SQL File Path........................: $SQL_FILE"
+   echo -e   "   Database type..............................: $DATABASE_TYPE"
+   echo -e   "   Databse name...............................: $DATABASE_NAME"
+   echo -e   "   SQL File Path..............................: $SQL_FILE"
    echo ""
-   echo -e   "   Webserver user.......................: $HTTP_USER"
-   echo -e   "   Webserver group......................: $HTTP_GROUP"
+   echo -e   "   Webserver user.............................: $HTTP_USER"
+   echo -e   "   Webserver group............................: $HTTP_GROUP"
    echo ""
    if [[ -n "$PHP_VERSION" ]]; then
-      echo -e   "   PHP version..........................: $PHP_VERSION"
-      echo -e   "   PHP Engine...........................: $PHP_ENGINE"
+      echo -e   "   PHP version................................: $PHP_VERSION"
+      echo -e   "   PHP Engine.................................: $PHP_ENGINE"
       echo ""
    fi
    if [[ "$DATABASE_TYPE" = "mysql" ]] ; then
-      echo -e   "   Mysql Credentials....................: $MYSQL_CREDENTIALS"
+      echo -e   "   Mysql Credentials..........................: $MYSQL_CREDENTIALS"
    fi
    echo ""