From 301e0d69e127327161606c38a4a8fadc2011ca89 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 20 May 2019 22:43:31 +0200 Subject: [PATCH] Enfore SKIP_DELETION when SYNC_TYPE set --- dev/n_osync.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 67c3996..7d57809 100644 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2019 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-beta2 -PROGRAM_BUILD=2019052013 +PROGRAM_BUILD=2019052014 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -1741,11 +1741,15 @@ function Sync { if [ "$SYNC_TYPE" == "initiator2target" ]; then resumeInitiator="${SYNC_ACTION[5]}" resumeTarget="${SYNC_ACTION[6]}" - rsyncRemoteDelete=true + if [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -ne 0 ]; then + rsyncRemoteDelete=true + fi elif [ "$SYNC_TYPE" == "target2initiator" ]; then resumeInitiator="${SYNC_ACTION[6]}" resumeTarget="${SYNC_ACTION[5]}" - rsyncRemoteDelete=true + if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -ne 0 ]; then + rsyncRemoteDelete=true + fi fi ################################################################################################################################################# Actual sync begins here