From b1b12e8a05800786a34b04490588f1071ba88536 Mon Sep 17 00:00:00 2001 From: Dmitriy Haidiuk Date: Wed, 13 Apr 2022 00:11:32 +0300 Subject: [PATCH] Updated backup remove cron date variable. --- src/backup.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backup.sh b/src/backup.sh index 2fece34..517e070 100644 --- a/src/backup.sh +++ b/src/backup.sh @@ -79,16 +79,17 @@ else fi echo "Uploading backup to $S3_BUCKET..." -aws "$aws_args" s3 cp "$local_file" "$s3_uri" +aws $aws_args s3 cp "$local_file" "$s3_uri" rm "$local_file" echo "Backup complete." if [ "$BACKUP_KEEP_DAYS" -ne 0 ]; then - date_from_remove=$(date -v -"${BACKUP_KEEP_DAYS}"d +"%Y-%m-%d") + ms=$((2*BACKUP_KEEP_DAYS+1)) + date_from_remove=$(date -d "@$(($(date +%s) - ms))" +%Y-%m-%d) backups_query="Contents[?LastModified<='${date_from_remove} 00:00:00'].{Key: Key}" - remove_backups=$(aws s3api list-objects-v2 --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 old backup from $S3_BUCKET..." - eval "$remove_backups"; + 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