From 2b2b409337366ba9fc6f808d713d9104bcccddf9 Mon Sep 17 00:00:00 2001
From: Jensa <migasQ@users.noreply.github.com>
Date: Fri, 12 May 2023 16:52:38 +0200
Subject: [PATCH] merge request and linting fixes

---
 docker-compose.yml |  2 +-
 scripts/backup.sh  | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8387788..ed438f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3'
 services:
 
   zammad-backup:
-    command: ["zammad-timed-backup"]
+    command: ["zammad-backup"]
     depends_on:
       - zammad-railsserver
       - zammad-postgresql
diff --git a/scripts/backup.sh b/scripts/backup.sh
index cae095e..da02955 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -38,32 +38,20 @@ function zammad_backup {
   echo "backup finished :)"
 }
 
-if [ "$1" = 'zammad-timed-backup' ]; then
-
-  check_railsserver_available
-
-  while true; do
-    NOW_TIMESTAMP=`date +%s`
-    TOMORROW_DATE=`date -d@"$(( $NOW_TIMESTAMP + 24*60*60 ))" +%Y-%m-%d`
-    
-    zammad_backup
-
-    NEXT_TIMESTAMP=`date -d "$TOMORROW_DATE $BACKUP_TIME" +%s`
-    NOW_TIMESTAMP=`date +%s`
-
-    sleep $(( ${NEXT_TIMESTAMP} - ${NOW_TIMESTAMP} ))
-  done
-fi
-
 if [ "$1" = 'zammad-backup' ]; then
 
   check_railsserver_available
 
   while true; do
+    NOW_TIMESTAMP=$(date +%s)
+    TOMORROW_DATE=$(date -d@"$(( $NOW_TIMESTAMP + 24*60*60 ))" +%Y-%m-%d)
+    
     zammad_backup
 
-    # wait until next backup
-    sleep "${BACKUP_SLEEP}"
+    NEXT_TIMESTAMP=$(date -d "$TOMORROW_DATE $BACKUP_TIME" +%s)
+    NOW_TIMESTAMP=$(date +%s)
+
+    sleep $(( $NEXT_TIMESTAMP - $NOW_TIMESTAMP ))
   done
 fi