From ee7784c5d7dfeec1f1e9a22656feb4550d66a463 Mon Sep 17 00:00:00 2001
From: Sergio <jaildesigner@gmail.com>
Date: Sun, 14 May 2023 17:10:00 +0200
Subject: [PATCH] Finalizadas las actualizaciones en backup_maverick.sh

---
 backup_maverick.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/backup_maverick.sh b/backup_maverick.sh
index cc1f9a2..199d953 100755
--- a/backup_maverick.sh
+++ b/backup_maverick.sh
@@ -24,21 +24,21 @@ readonly BACKUP_DOCKER_VOLUMES=/var/volumes
 mount $BACKUP_MOUNT
 
 ## Empieza el proceso de backup
-printf "\n\nBACKUP (%s)\n" "${NOW}" | tee "${LOG}"
+printf "\n\nCOMIENZA LA COPIA DE SEGURIDAD (%s)\n" "${NOW}" | tee -a "${LOG}"
 
 ## Backup de ficheros del sistema
-printf "\n\n>> BACKUP SYSTEM FILES\n" | tee "${LOG}"
+printf "\n\n>> COPIANDO FICHEROS DEL SISTEMA\n" | tee -a "${LOG}"
 for i in /etc/cron.*; do
-    rsync -avh --delete "$i" "${TARGET_SYSTEM_FILES}"/ | tee "${LOG}"
+    rsync -avh --delete "$i" "${TARGET_SYSTEM_FILES}"/ | tee -a "${LOG}"
 done
-rsync -avh --delete /etc/fstab "${TARGET_SYSTEM_FILES}"/ | tee "${LOG}"
+rsync -avh --delete /etc/fstab "${TARGET_SYSTEM_FILES}"/ | tee -a "${LOG}"
 
 ## Backup de ficheros
 FILES=".gitconfig .git-credentials"
 for FILE in $FILES; do
-    printf "\n\n>> BACKUP FILES\n" | tee "${LOG}"
+    printf "\n\n>> COPIANDO FICHEROS\n" | tee -a "${LOG}"
     if [ -f "${BACKUP_HOME}"/"${FILE}" ]; then
-        rsync -avh --delete "${BACKUP_HOME}"/"${FILE}" "${TARGET_FILES}" | tee "${LOG}"
+        rsync -avh --delete "${BACKUP_HOME}"/"${FILE}" "${TARGET_FILES}/" | tee -a "${LOG}"
     fi
 done
 
@@ -46,21 +46,27 @@ done
 FOLDERS=".ssh"
 for FOLDER in $FOLDERS; do
     if [ -d "${BACKUP_HOME}"/"${FOLDER}" ]; then
-        printf "\n\n>> BACKUP %s\n" "${FOLDER}" | tee "${LOG}"
-        rsync -avh --delete "${BACKUP_HOME}"/"${FOLDER}" "${TARGET_HOME}"/"${FOLDER}" | tee "${LOG}"
+        printf "\n\n>> COPIANDO %s\n" "${FOLDER}" | tee -a "${LOG}"
+        rsync -avh --delete "${BACKUP_HOME}"/"${FOLDER}" "${TARGET_HOME}" | tee -a "${LOG}"
     fi
 done
 
 ## Backup de docker compose y volumenes
-docker stop "$(docker ps -q)"
+printf "\n\n>> DETENIENDO CONTENEDORES\n"
+docker stop $(docker ps -q) | tee -a "${LOG}"
+
 FOLDER=DOCKER
 if [ -d "${BACKUP_DOCKER}" ]; then
-    printf "\n\n>> BACKUP %s\n" "${FOLDER}" | tee "${LOG}"
-    rsync -avh --delete "${BACKUP_DOCKER}/" "${TARGET_DOCKER}/compose/" | tee "${LOG}"
+    printf "\n\n>> COPIANDO %s\n" "${FOLDER}" | tee -a "${LOG}"
+    mkdir -p "${TARGET_DOCKER}/compose/"
+    rsync -avh --delete "${BACKUP_DOCKER}/" "${TARGET_DOCKER}/compose/" | tee -a "${LOG}"
 fi
 FOLDER=DOCKER_VOLUMES
 if [ -d "${BACKUP_DOCKER_VOLUMES}" ]; then
-    printf "\n\n>> BACKUP %s\n" "${FOLDER}" | tee "${LOG}"
-    rsync -avh --delete "${BACKUP_DOCKER_VOLUMES}/" "${TARGET_DOCKER}/volumes/" | tee "${LOG}"
+    printf "\n\n>> COPIANDO %s\n" "${FOLDER}" | tee -a "${LOG}"
+    mkdir -p "${TARGET_DOCKER}/volumes/"
+    rsync -avh --delete "${BACKUP_DOCKER_VOLUMES}/" "${TARGET_DOCKER}/volumes/" | tee -a "${LOG}"
 fi
-docker start "$(docker ps -a -q)"
+
+printf "\n\n>> ARRANCANDO CONTENEDORES\n"
+docker start $(docker ps -a -q) | tee -a "${LOG}"
\ No newline at end of file