From cf1f8ca0e97b0c6bb9948ad24222028551701a6b Mon Sep 17 00:00:00 2001
From: Marco Kundt <mrckndt@riseup.net>
Date: Thu, 11 Jun 2020 20:55:50 +0200
Subject: [PATCH] move prune to backup

---
 borg/.bin/borg_backup | 3 +++
 borg/.bin/borg_prune  | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100755 borg/.bin/borg_prune

diff --git a/borg/.bin/borg_backup b/borg/.bin/borg_backup
index 22b4fa6..515ff20 100755
--- a/borg/.bin/borg_backup
+++ b/borg/.bin/borg_backup
@@ -4,3 +4,6 @@ source $HOME/.bin/borg_common
 
 info "Starting backup"
 borg create --list --verbose --filter AME --stats --show-rc --compression zstd,3 ::'{hostname}-{now}' $BACKUP_PATHS
+
+info "Pruning snapshots"
+borg prune --list --prefix '{hostname}-' --show-rc --keep-hourly $KEEP_HOURS --keep-daily $KEEP_DAYS --keep-weekly $KEEP_WEEKS --keep-monthly $KEEP_MONTHS --keep-yearly $KEEP_YEARS
diff --git a/borg/.bin/borg_prune b/borg/.bin/borg_prune
deleted file mode 100755
index 89842a0..0000000
--- a/borg/.bin/borg_prune
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-source $HOME/.bin/borg_common
-
-info "Pruning snapshots"
-borg prune --list --prefix '{hostname}-' --show-rc --keep-hourly $KEEP_HOURS --keep-daily $KEEP_DAYS --keep-weekly $KEEP_WEEKS --keep-monthly $KEEP_MONTHS --keep-yearly $KEEP_YEARS