From 40ad7abac4af124ae58b3367ff8f525d7b6aea8f Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Wed, 8 Nov 2023 08:35:22 -0800 Subject: [PATCH] No more extra now --- install/assets/functions/10-db-backup | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index edc5242..323bc63 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -7,9 +7,9 @@ bootstrap_filesystem() { if [ "$(stat -c %U "${backup_job_filesystem_path}")" != "dbbackup" ] ; then chown -R dbbackup:dbbackup "${backup_job_filesystem_path}" ; fi if [ "$(stat -c %a "${backup_job_filesystem_path}")" != "${backup_job_filesystem_permission}" ] ; then chmod -R "${backup_job_filesystem_permission}" "${backup_job_filesystem_path}" ; fi - if [ -d "${backup_job_filesystem_archive}" ]; then - if [ "$(stat -c %U "${backup_job_filesystem_archive}")" != "dbbackup" ] ; then chown -R dbbackup:dbbackup "${backup_job_filesystem_archive}" ; fi - if [ "$(stat -c %a "${backup_job_filesystem_archive}")" != "${backup_job_filesystem_permission}" ] ; then chmod -R "${backup_job_filesystem_permission}" "${backup_job_filesystem_archive}" ; fi + if [ -d "${backup_job_filesystem_archive_path}" ]; then + if [ "$(stat -c %U "${backup_job_filesystem_archive_path}")" != "dbbackup" ] ; then chown -R dbbackup:dbbackup "${backup_job_filesystem_archive_path}" ; fi + if [ "$(stat -c %a "${backup_job_filesystem_archive_path}")" != "${backup_job_filesystem_permission}" ] ; then chmod -R "${backup_job_filesystem_permission}" "${backup_job_filesystem_archive_path}" ; fi fi if [ ! -d "${LOG_PATH}" ]; then @@ -1356,8 +1356,6 @@ move_dbbackup() { prepare_dbbackup() { timer backup start now=$(run_as_user date +"%Y%m%d-%H%M%S") - now_date=$(run_as_user date +"%Y-%m-%d") - now_time=$(run_as_user date +"%H:%M:%S") backup_job_filename_base=${dbtype}_${backup_job_db_name,,}_${backup_job_db_host,,} backup_job_filename=${dbtype}_${backup_job_db_name,,}_${backup_job_db_host,,}_${now}.sql }