From 305b169e0390b1d86fd673e27a1d21f463b2cc72 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Wed, 17 Jun 2020 04:21:27 +0000
Subject: [PATCH] Added new backup and changed formatting

---
 backup.sh |   39 ++++++++++++++++-----------------------
 1 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/backup.sh b/backup.sh
index 546a867..401bfc4 100755
--- a/backup.sh
+++ b/backup.sh
@@ -2,37 +2,30 @@
 
 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() {
-	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 "duplicacy" || echo "files")  $(! [ -z $3 ] && echo "-P")
+			;;
+	esac
 }
 
 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
@@ -41,7 +34,7 @@
 			sync $i n p
 		done
 		for i in ${RCLONE_FILES[*]}; do
-			echo '\033[0;31m'$i files'\033[0m'
+			echo -e '\033[0;31m'$i files'\033[0m'
 			sync $i p p
 		done
 	fi

--
Gitblit v1.9.3