From 06ca2f6a3794d2facfb5cf8a7185a1e6f2cf5fea Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 9 Aug 2016 14:12:07 +0200
Subject: [PATCH] Fixed executability for macosX

---
 dev/ofunctions.sh | 7 ++++---
 sync.conf         | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
index d555e45..d44ae18 100644
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -1267,10 +1267,11 @@ function InitLocalOSSettings {
 function InitRemoteOSSettings {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
+	#TODO: fix add -E when both initiator and targets don't run MacOSX and PRESERVE_EXECUTABILITY=yes
 	## MacOSX does not use the -E parameter like Linux or BSD does (-E is mapped to extended attrs instead of preserve executability)
-	if [ "$LOCAL_OS" != "MacOSX" ] && [ "$REMOTE_OS" != "MacOSX" ]; then
-		RSYNC_ATTR_ARGS=$RSYNC_ATTR_ARGS" -E"
-	fi
+	#if [ "$LOCAL_OS" != "MacOSX" ] && [ "$REMOTE_OS" != "MacOSX" ]; then
+	#	RSYNC_ATTR_ARGS=$RSYNC_ATTR_ARGS" -E"
+	#fi
 
 	if [ "$REMOTE_OS" == "msys" ]; then
 		REMOTE_FIND_CMD=$(dirname $BASH)/find
diff --git a/sync.conf b/sync.conf
index c9dad7d..87203f7 100644
--- a/sync.conf
+++ b/sync.conf
@@ -2,7 +2,7 @@
 
 ###### osync - Rsync based two way sync engine with fault tolerance
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### osync v1.1x / v1.2x config file rev 2016080901
+###### osync v1.1x / v1.2x config file rev 2016080902
 
 ## ---------- GENERAL OPTIONS
 
@@ -80,6 +80,9 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com"
 PRESERVE_PERMISSIONS=yes
 PRESERVE_OWNER=yes
 PRESERVE_GROUP=yes
+## Does not work and will be ignored on MacOS X
+PRESERVE_EXECUTABILITY=yes
+
 ## Preserve ACLS. Make sure source and target FS can manage same ACLs or you'll get loads of errors.
 PRESERVE_ACL=no
 ## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.