diff --git a/btrbk.sh b/btrbk.sh index c84b5ab..dfe1704 100755 --- a/btrbk.sh +++ b/btrbk.sh @@ -7,14 +7,16 @@ snapDir="/.snapshots/" rcloneDir="test:/mnt/bk/new/" function main { + date=$(date +%Y-%m-%d) + month=$(date +%B) for i in ${!subVols[@]} do - snapName=${volName[$i]}.$(date +%Y-%m-%d) - snapYest=$snapDir${volName[$i]}.$(date -d "yesterday" +%Y-%m-%d) + snapName=${volName[$i]}.$date + snapYest=$snapDir${volName[$i]}.$(date -d "$date -1 day" +%Y-%m-%d) btrfs subvolume snapshot -r ${subVols[$i]} $snapDir$snapName if [[ -d "$snapYest" && $bkType = daily ]] then - btrfs send -p $snapYest $snapDir$snapName | gpg --batch -er $pubKey -o - | rclone rcat $rcloneDir$(date +%B)/$snapName.pgp + btrfs send -p $snapYest $snapDir$snapName | gpg --batch -er $pubKey -o - | rclone rcat $rcloneDir$month/$snapName.pgp else btrfs send $snapDir$snapName | gpg --batch -er $pubKey -o - | rclone rcat $rcloneDir$snapName.pgp @@ -23,11 +25,11 @@ function main { then for f in `seq 1 2` do - btrfs subvolume delete $snapDir${volName[$i]}.$(date -d "$f days ago" +%Y-%m-%d) + btrfs subvolume delete $snapDir${volName[$i]}.$(date -d "$date -$f day" +%Y-%m-%d) done - rclone delete $rcloneDir$(date -d "1 month ago" +%B)/ + rclone delete $rcloneDir$(date -d "$month -1 month" +%B)/ else - btrfs subvolume delete $snapDir${volName[$i]}.$(date -d "2 days ago" +%Y-%m-%d) + btrfs subvolume delete $snapDir${volName[$i]}.$(date -d "$date -2 day" +%Y-%m-%d) fi done }