From 2b28f9f0ec18306f54876c53c8cfa7f5a5ed933d Mon Sep 17 00:00:00 2001
From: Dmitriy Haidiuk <fulminantd@gmail.com>
Date: Wed, 13 Apr 2022 11:16:23 +0300
Subject: [PATCH] Updated removing old backups logic.

---
 Dockerfile    |  2 +-
 README.md     |  2 +-
 src/backup.sh | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4ab650b..8738374 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ ENV S3_ENDPOINT ''
 ENV S3_S3V4 'no'
 ENV SCHEDULE ''
 ENV PASSPHRASE ''
-ENV BACKUP_KEEP_DAYS 7
+ENV BACKUP_KEEP_DAYS ''
 
 ADD src/run.sh run.sh
 ADD src/backup.sh backup.sh
diff --git a/README.md b/README.md
index ee3c7bc..200b083 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ pg_backup_s3:
     POSTGRES_DATABASE: dbname
     POSTGRES_USER: user
     POSTGRES_PASSWORD: password
-    BACKUP_KEEP_DAYS: 7
+    BACKUP_KEEP_DAYS: 7 // Disabled by default.
 ```
 
 - Images are tagged by the major PostgreSQL version they support: `10`, `11`, `12`, `13`, or `14`.
diff --git a/src/backup.sh b/src/backup.sh
index 6bc6d83..2d84359 100644
--- a/src/backup.sh
+++ b/src/backup.sh
@@ -84,12 +84,17 @@ rm "$local_file"
 
 echo "Backup complete."
 
-if [ "$BACKUP_KEEP_DAYS" -ne 0 ]; then
-  ms=$((86400*BACKUP_KEEP_DAYS))
-  date_from_remove=$(date -d "@$(($(date +%s) - ms))" +%Y-%m-%d)
+if [ -n "$BACKUP_KEEP_DAYS" ]; then
+  sec=$((86400*BACKUP_KEEP_DAYS))
+  date_from_remove=$(date -d "@$(($(date +%s) - sec))" +%Y-%m-%d)
   backups_query="Contents[?LastModified<='${date_from_remove} 00:00:00'].{Key: Key}"
 
   echo "Removing old backup from $S3_BUCKET..."
-  aws s3api list-objects --bucket "${S3_BUCKET}" --prefix "${S3_PREFIX}" --query "${backups_query}" --output text | xargs -n1 -t -I 'KEY' aws s3 rm s3://"${S3_BUCKET}"/'KEY'
+  aws s3api list-objects \
+    --bucket "${S3_BUCKET}" \
+    --prefix "${S3_PREFIX}" \
+    --query "${backups_query}" \
+    --output text \
+    | xargs -n1 -t -I 'KEY' aws s3 rm s3://"${S3_BUCKET}"/'KEY'
   echo "Removing complete."
 fi