From 7db77520fc011397540bfa230df58cb94e286310 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Thu, 11 Mar 2021 07:49:10 +0000
Subject: [PATCH] Merge branch 'master' of github.com:Chizi123/Scripts
---
backup.sh | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/backup.sh b/backup.sh
index 401bfc4..83a2b73 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,8 +2,9 @@
BACKUP_DIR="/backup/work/"
FILES_DIR="/home/joel/OneDrive/"
-RCLONE_BACKUP=("OneDrive_Personal" "GoogleDrive" "Mega" "unimelb" "sout" "pCloud" "gdrive_unimelb")
-RCLONE_FILES=("sout" "Mega" "unimelb" "gdrive_unimelb")
+RCLONE_BACKUP=("GoogleDrive" "Mega" "unimelb" "pCloud" "gdrive_unimelb" "NC_home" "NextCloud")
+RCLONE_FILES=("Mega" "unimelb" "gdrive_unimelb" "NC_home")
+EXCLUDES="--exclude '*~' --exclude '*#*' --exclude '.DS_Store' --exclude '*.7z' "
function sync() {
case $1 in
@@ -13,7 +14,7 @@
;;
*)
rclone sync $([ $2 != "p" ] && echo "$BACKUP_DIR" || echo "$FILES_DIR") \
- $1:/Uni/$([ $2 != "p" ] && echo "duplicacy" || echo "files") $(! [ -z $3 ] && echo "-P")
+ $1:/Uni/$([ $2 != "p" ] && echo "borg" || echo "files") $(! [ -z $3 ] && echo "-P")
;;
esac
}
@@ -46,23 +47,34 @@
echo -e '\033[0;32m'Syncing'\033[0m'
sync_all p
exit
+elif [ "$1" = "cron" ]; then
+ borg create \
+ --compression zstd,22 \
+ $EXCLUDES \
+ \
+ $BACKUP_DIR::"$(date +%F+%R)" \
+ $FILES_DIR
+else
+ borg create \
+ --verbose \
+ --stats \
+ --compression zstd,22 \
+ $EXCLUDES \
+ \
+ $BACKUP_DIR::"$(date +%F+%R)" \
+ $FILES_DIR
fi
-LAST="$(duplicacy list | tail -n1 | cut -d' ' -f4)"
-CURR="$(duplicacy backup | tail -n1 | sed 's/[^0-9]//g')"
-#LAST=2
-#CURR=4
-DIFF="$(duplicacy diff -r $CURR -r $LAST | grep '-')"
+borg prune \
+ --keep-hourly 12 \
+ --keep-daily 8 \
+ --keep-monthly 2 \
+ $BACKUP_DIR
-#echo "curr - $CURR"
-#echo "last - $LAST"
-#echo "diff - $DIFF"
-
-duplicacy prune -keep 7:30 -keep 1:7 -exclusive > /dev/null 2>&1
-
-if [ -z "$DIFF" ]; then
- duplicacy prune -r $CURR -exclusive > /dev/null 2>&1
+LAST="$(borg list $BACKUP_DIR | tail -n2 | cut -d' ' -f1)"
+if [ -z "$(borg diff $BACKUP_DIR::$(echo $LAST | cut -d' ' -f1) $(echo $LAST | cut -d' ' -f2))" ]; then
+ borg delete $BACKUP_DIR::$(echo $LAST | cut -d' ' -f2)
else
- echo "New backup $CURR"
+ echo "New backup $(echo $LAST | cut -d' ' -f2)"
sync_all
fi
--
Gitblit v1.9.3