From a1420a635b0b9eceb280bbe30e36462033907955 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 16 Jul 2013 08:33:48 +0200 Subject: [PATCH] Bugfixes... --- README.md | 8 ++++---- osync.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 64a3f70..2166c53 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ osync ===== -A two way sync script based on rsync that merges obackup script fault tolerance with sync logic derived from bitpocket project. +A two way sync script based that adds script fault tolerance from obackup project. ## About Having created obackup script in order to make reliable quick backups, i searched for a nice tool to handle two (or more) way sync scenarios in a reliable way. While unison handles these scenarios, it's pretty messy to configure, slow and won't handle ACLs. That's where bitpocket came handy, a nice script provided by sickill https://github.com/sickill/bitpocket.git -It's quick and small, but lacks some of the features i searched for like fault tolerance, stop and continue scenarios, and email warnings. +It's quick and small, but lacks some of the features i searched for like fault tolerance, stop and resume scenarios, and email warnings. -I then decided to merge my obackup codebase with bitpocket's sync core, osync was born. +I then decided to write my own implementation of a two way rsync sync script, which would the features i wanted. ## Installation Not even beta ready yet. The whole code is not stable at all. -Hopefully will work by the end of July. +Hopefully will work (more or less) by the end of July. I'm developping this in my free time. ## Author diff --git a/osync.sh b/osync.sh index 49d3f34..4e9c019 100755 --- a/osync.sh +++ b/osync.sh @@ -411,9 +411,9 @@ function Sync rsync -rlptgodEui --backup --backup-dir "$SLAVE_BACKUP_DIR" --exclude "$OSYNC_DIR" --exclude-from "$STATE_DIR/slave-deleted-list" --exclude-from "$STATE_DIR/master-deleted-list" $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/ Log "Propagating deletitions to slave" - rsync -rlptgodEui --backup --backup-dir "$MASTER_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/master-deleted-list" --exclude='*' $MASTER_SYNC_DIR/ $SLAVE_SYNC_DIR/ + rsync -rlptgodEui --backup --backup-dir "$MASTER_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/master-deleted-list" --exclude-from "$STATE_DIR/slave-deleted-list" $MASTER_SYNC_DIR/ $SLAVE_SYNC_DIR/ Log "Propagating deletitions to master" - rsync -rlptgodEui --backup --backup-dir "$SLAVE_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/slave-deleted-list" --exclude='*' $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/ + rsync -rlptgodEui --backup --backup-dir "$SLAVE_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/slave-deleted-list" --exclude-from "$STATE_DIR/master-deleted-list" $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/ ## Create local file list Log "Creating new master file list"