From 40f5e4e11932669aeb0838612fea9bebd5c5182c Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 24 Aug 2021 11:49:10 +0000
Subject: [PATCH] Merge branch 'master' of github.com:Chizi123/Scripts
---
backup.sh | 121 +++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/backup.sh b/backup.sh
index 546a867..fd5e64e 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,74 +2,79 @@
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=("GoogleDrive" "Mega" "unimelb" "pCloud" "gdrive_unimelb")
+RCLONE_FILES=("Mega" "unimelb" "gdrive_unimelb")
+EXCLUDES="/home/joel/Scripts/backup_patterns.txt"
function sync() {
- if [ $2 != "p" ]; then
- case $1 in
- "sout")
- rclone sync $BACKUP_DIR $1:/data/Cloud/backup $(! [ -z $3 ] && echo "-P")
- ;;
- *)
- rclone sync $BACKUP_DIR $1:/Uni/duplicacy $(! [ -z $3 ] && echo "-P")
- ;;
- esac
- else
- case $1 in
- "sout")
- rclone sync $FILES_DIR $1:/data/Cloud/files $(! [ -z $3 ] && echo "-P")
- ;;
- *)
- rclone sync $FILES_DIR $1:/Uni/files $(! [ -z $3 ] && echo "-P")
- ;;
- esac
- fi
+ 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:/Uni/$([ $2 != "p" ] && echo "borg" || echo "files") $(! [ -z $3 ] && echo "-P")
+ ;;
+ esac
}
function sync_all() {
- if [ -z $1 ]; then
- for i in ${RCLONE_BACKUP[*]}; do
- sync $i &
- done
- for i in ${RCLONE_FILES[*]}; do
- sync $i p &
- done
- else
- for i in ${RCLONE_BACKUP[*]}; do
- echo -e '\033[0;31m'$i backup'\033[0m'
- sync $i n p
- done
- for i in ${RCLONE_FILES[*]}; do
- echo '\033[0;31m'$i files'\033[0m'
- sync $i p p
- done
- fi
+ if [ -z $1 ]; then
+ for i in ${RCLONE_BACKUP[*]}; do
+ #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
+ for i in ${RCLONE_BACKUP[*]}; do
+ echo -e '\033[0;31m'$i backup'\033[0m'
+ sync $i n p
+ done
+ for i in ${RCLONE_FILES[*]}; do
+ echo -e '\033[0;31m'$i files'\033[0m'
+ sync $i p p
+ done
+ fi
}
-cd /home/joel/OneDrive
-
if [ "$1" = "sync" ]; then
- echo -e '\033[0;32m'Syncing'\033[0m'
- sync_all p
- exit
+ echo -e '\033[0;32m'Syncing'\033[0m'
+ sync_all p
+ exit
+elif [ "$1" = "cron" ]; then
+ borg create \
+ --compression zstd,22 \
+ --exclude-from $EXCLUDES \
+ \
+ $BACKUP_DIR::"$(date +%F+%R)" \
+ $FILES_DIR
+else
+ borg create \
+ --verbose \
+ --stats \
+ --compression zstd,22 \
+ --exclude-from $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)"
+TOP="$(echo $LAST | cut -d' ' -f1)"
+BOTTOM="$(echo $LAST | cut -d' ' -f2)"
+if [ -z "$(borg diff $BACKUP_DIR::$TOP $BOTTOM)" ]; then
+ borg delete $BACKUP_DIR::$(echo $LAST | cut -d' ' -f2)
else
- echo "New backup $CURR"
- sync_all
+ echo "New backup $(echo $LAST | cut -d' ' -f2)"
+ sync_all
fi
--
Gitblit v1.9.3