From 6258df971a00f175cd434e7874c6ba5616b50e60 Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Sat, 18 Dec 2021 11:37:10 +0100
Subject: update

---
 bin/backup       |  3 +--
 bin/backup-clean | 11 ++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/backup b/bin/backup
index 3964927..d682849 100755
--- a/bin/backup
+++ b/bin/backup
@@ -42,6 +42,5 @@ esac
 
 date=$(date +%Y-%m-%d-%H%M%S)
 
-[ "$optv" ] && echo "# Backup $volumes to $BACKUP/$date"
-
+echo "# Backup $volumes to $BACKUP/$date"
 exec rsync -HSxa$optv $ignore $opt_link $volumes "$BACKUP/$date"
diff --git a/bin/backup-clean b/bin/backup-clean
index 1c752d9..34e6d97 100755
--- a/bin/backup-clean
+++ b/bin/backup-clean
@@ -33,7 +33,7 @@ host=${BACKUP%:*} dir=${BACKUP#*:}
 ls='ls -r' rm="xargs -r $optv $optn rm -rf"
 [ "$host" = "$dir" ] || ls="ssh $host $ls" rm="ssh $host $rm"
 
-[ "$optv" ] && echo "# Cleaning backups on $BACKUP"
+echo "# Cleaning backups on $BACKUP"
 
 $ls "$dir" |
 awk -v now=$(date +%Y-%m-%d) -v dir="$dir" '
@@ -48,11 +48,16 @@ BEGIN {
 	db = substr($0, 9, 2)  # Day backup
 	$0 = dir "/" $0
 
-	if (yb != yn) {
+	dy = yn - yb
+	dm = dy * 12 + mn - mb
+	# if (yb != yn) {
+	if (dm > 12) {
 		if (yb in yearly) print; else yearly[yb] = 1
 		next
 	}
-	if (mb != mn) {
+	# if (mb != mn) {
+	dd = dm * 30 + dn - db
+	if (dd > 30) {
 		if (mb in monthly) print; else monthly[mb] = 1
 		next
 	}
-- 
cgit v1.2.3