From 6840e65f8107318ebbcf4da06794fa9987521938 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 21 Sep 2020 11:53:40 +0000
Subject: [PATCH] Use compressed btrfs partition as root
---
backup.sh | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/backup.sh b/backup.sh
index 4898c7a..13d1dc8 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,16 +2,18 @@
BACKUP_DIR="/backup/work/"
FILES_DIR="/home/joel/OneDrive/"
-RCLONE_BACKUP=("OneDrive_Personal" "NextCloud" "GoogleDrive" "Mega" "unimelb" "sout" "pCloud")
-RCLONE_FILES=("sout" "Mega" "unimelb")
+RCLONE_BACKUP=("OneDrive_Personal" "GoogleDrive" "Mega" "unimelb" "sout" "pCloud" "gdrive_unimelb")
+RCLONE_FILES=("sout" "Mega" "unimelb" "gdrive_unimelb")
function sync() {
case $1 in
"sout")
- rclone sync $([ $2 != "p" ] && echo "$BACKUP_DIR" || echo "$FILES_DIR") $1:/data/Cloud/$([ $2 != "p" ] && echo "backup" || echo "files") $(! [ -z $3 ] && echo "-P")
+ rclone sync $([ $2 != "p" ] && echo "$BACKUP_DIR" || echo "$FILES_DIR") \
+ $1:/data/Cloud/$([ $2 != "p" ] && echo "backup" || echo "files") $(! [ -z $3 ] && echo "-P")
;;
*)
- rclone sync $([ $2 != "p" ] && echo "$BACKUP_DIR" || echo "$FILES_DIR") $1:/Uni/$([ $2 != "p" ] && echo "duplicacy" || echo "files") $(! [ -z $3 ] && echo "-P")
+ rclone sync $([ $2 != "p" ] && echo "$BACKUP_DIR" || echo "$FILES_DIR") \
+ $1:/Uni/$([ $2 != "p" ] && echo "borg" || echo "files") $(! [ -z $3 ] && echo "-P")
;;
esac
}
@@ -19,9 +21,11 @@
function sync_all() {
if [ -z $1 ]; then
for i in ${RCLONE_BACKUP[*]}; do
- sync $i &
+ #echo -e '\033[0;31m'$i backup'\033[0m'
+ sync $i n &
done
for i in ${RCLONE_FILES[*]}; do
+ #echo -e '\033[0;31m'$i files'\033[0m'
sync $i p &
done
else
@@ -42,23 +46,36 @@
echo -e '\033[0;32m'Syncing'\033[0m'
sync_all p
exit
+elif [ "$1" = "cron" ]; then
+ borg create \
+ --compression zstd,22 \
+ --exclude '*~' \
+ --exclude '*#*' \
+ \
+ $BACKUP_DIR::"$(date +%F+%R)" \
+ $FILES_DIR
+else
+ borg create \
+ --verbose \
+ --stats \
+ --compression zstd,22 \
+ --exclude '*~' \
+ --exclude '*#*' \
+ \
+ $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 24 \
+ --keep-daily 7 \
+ --keep-monthly 4 \
+ $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