Added FreeBSD 11 note

Merged PR60 / PR62

.travis.yml

@@ -0,0 +1,16 @@
+language:
+    bash
+
+os:
+    linux
+    osx
+
+before_install:
+    sudo apt-get install inotify-tools acl
+
+sudo:
+    required
+
+script:
+    TRAVIS_RUN=true dev/tests/run_tests.sh
+

CHANGELOG.md

@@ -7,6 +7,44 @@ KNOWN ISSUES
 RECENT CHANGES
 --------------
 
+dd Mmm YYYY: osync v1.1.6 released
+- Backported v1.2.1 fixes
+	- Fixed an issue with filenames ending with spaces, their deletion not being propagated, and ACL / conflicts not being managed (still they got synced)
+	- Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds
+	- Fixed osync deletion not working on systems with ssh banner enabled
+	- Fixed low severity security issue where log and run files could be read by other users
+- SLEEP_TIME, SOFT_MAX_EXEC_TIME and HARD_MAX_EXEC_TIME can now be set as environment variables
+- Backported unit tests from v1.2-beta allowing to fix the following
+	- HARD_MAX_EXEC_TIME wasn't enforced properly
+
+17 Nov 2016: osync v1.1.5 released
+- Backported unit tests from v1.2-beta allowing to fix the following
+	- Allow quicksync mode to specify rsync include / exclude patterns as environment variables
+	- Added default path separator char in quicksync mode for multiple includes / exclusions
+	- Local runs should not check for remote connectivity
+	- Fixed backups go into root of replica instead of .osync_wordir/backups
+	- Fixed error alerts cannot be triggered from subprocesses
+	- Fixed remote locked targets are unlocked in any case
+
+10 Nov 2016: osync v1.1.4 released
+- Fixed a corner case with sending alerts with logfile attachments when osync is used by multiple users
+
+02 Sep 2016: osync v1.1.3 released
+- Fixed directories containing spaces with bash >= 4.3
+- Fixed installer for CYGWIN / MSYS environment
+
+28 Aug 2016: osync v1.1.2 released
+- Renamed sync.conf to sync.conf.example (thanks to https://github.com/hortimech)
+- Fixed RunAfterHook may be executed twice
+- Fixed soft deletion when SUDO_EXEC is enabled
+
+06 Aug 2016: osync v1.1.1 released
+- Fixed bogus rsync pattern additions
+- Fixed soft deletion always enabled on target
+- Fixed problem with attributes file list function
+- Fixed deletion propagation code
+- Fixed missing deletion / backup diretories message in verbose mode
+
 27 Jul 2016: osync v1.1 released
 - More msys and cygwin compatibility
 - Logging begins now before any remote checks

README.md

@@ -1,5 +1,4 @@
-osync
-=====
+# osync  [![Build Status](https://travis-ci.org/deajan/osync.svg?branch=v1.1-maint)](https://travis-ci.org/deajan/osync) [![GitHub Release](https://img.shields.io/github/release/deajan/osync.svg?label=Latest)](https://github.com/deajan/osync/releases/latest)
 
 A two way filesync script with fault tolerance, resume, soft deletion, conflictual file backups running on bash (linux, BSD and virtually any system supporting bash).
 File synchronization is bidirectional, based on rsync, can be run manually, as scheduled task, or triggered on file changes.
@@ -26,6 +25,7 @@ osync tasks may be launched sequentially by osync osync-batch tool.
 
 Currently, it has been tested on CentOS 5.x, 6.x, 7.x, Debian 6, Debian 7, Linux Mint 14-17, Ubuntu 12.04, 12.10, FreeBSD 8.3, 10.1, 10.3, Mac OS X and pfSense.
 Microsoft Windows is supported via MSYS or Cygwin.
+Note that FreeBSD 11 is only supported in versions v1.2+.
 
 
 ## Installation
@@ -33,11 +33,12 @@ Microsoft Windows is supported via MSYS or Cygwin.
 Osync has been designed to not delete any data, but rather make backups of conflictual files or soft deletes.
 Nevertheless, you should always have a neat backup of your data before trying a new sync tool.
 
-You can download the latest stable release of Osync at www.netpower.fr/osync or https://github.com/deajan/osync/archive/v1.1.tar.gz
+You can download the latest stable release of osync at https://github.com/deajan/osync/archive/stable.tar.gz
 
 You may also get the last development version at https://github.com/deajan/osync with the following command
 
-	$ git clone -b "v1.1" https://github.com/deajan/osync
+	$ git clone https://github.com/deajan/osync
+	$ cd osync
 	$ sh install.sh
 
 Osync will install itself to /usr/local/bin and an example configuration file will be installed to /etc/osync

dev/common_install.sh

@@ -0,0 +1,315 @@
+#!/usr/bin/env bash
+
+PROGRAM=[prgname]
+PROGRAM_VERSION=[version]
+PROGRAM_BINARY=$PROGRAM".sh"
+PROGRAM_BATCH=$PROGRAM"-batch.sh"
+SCRIPT_BUILD=2016082902
+
+## osync / obackup / pmocr / zsnap install script
+## Tested on RHEL / CentOS 6 & 7, Fedora 23, Debian 7 & 8, Mint 17 and FreeBSD 8 & 10
+## Please adapt this to fit your distro needs
+
+#TODO: silent mode and no stats mode
+
+CONF_DIR=$FAKEROOT/etc/$PROGRAM
+BIN_DIR="$FAKEROOT/usr/local/bin"
+SERVICE_DIR_INIT=$FAKEROOT/etc/init.d
+# Should be /usr/lib/systemd/system, but /lib/systemd/system exists on debian & rhel / fedora
+SERVICE_DIR_SYSTEMD_SYSTEM=$FAKEROOT/lib/systemd/system
+SERVICE_DIR_SYSTEMD_USER=$FAKEROOT/etc/systemd/user
+
+## osync specific code
+OSYNC_SERVICE_FILE_INIT="osync-srv"
+OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM="osync-srv@.service"
+OSYNC_SERVICE_FILE_SYSTEMD_USER="osync-srv@.service.user"
+
+## pmocr specfic code
+PMOCR_SERVICE_FILE_INIT="pmocr-srv"
+PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM="pmocr-srv.service"
+
+## Generic code
+
+## Default log file
+if [ -w $FAKEROOT/var/log ]; then
+        LOG_FILE="$FAKEROOT/var/log/$PROGRAM-install.log"
+elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then
+        LOG_FILE="$HOME/$PROGRAM-install.log"
+else
+    	LOG_FILE="./$PROGRAM-install.log"
+fi
+
+# Generic quick logging function
+function _QuickLogger {
+        local value="${1}"
+       	local destination="${2}" # Destination: stdout, log, both
+
+        if ([ "$destination" == "log" ] || [ "$destination" == "both" ]); then
+                echo -e "$(date) - $value" >> "$LOG_FILE"
+        elif ([ "$destination" == "stdout" ] || [ "$destination" == "both" ]); then
+                echo -e "$value"
+       	fi
+}
+
+function QuickLogger {
+	local value="${1}"
+
+	if [ "$_SILENT" -eq 1 ]; then
+		_QuickLogger "$value" "log"
+	else
+		_QuickLogger "$value" "stdout"
+	fi
+}
+
+function urlencode() {
+    # urlencode <string>
+
+    local LANG=C
+    local length="${#1}"
+    for (( i = 0; i < length; i++ )); do
+        local c="${1:i:1}"
+        case $c in
+            [a-zA-Z0-9.~_-]) printf "$c" ;;
+            *) printf '%%%02X' "'$c" ;; 
+        esac
+    done
+}
+
+function SetOSSettings {
+	USER=root
+
+	local local_os_var
+
+	local_os_var="$(uname -spio 2>&1)"
+	if [ $? != 0 ]; then
+		local_os_var="$(uname -v 2>&1)"
+		if [ $? != 0 ]; then
+			local_os_var="$(uname)"
+		fi
+	fi
+
+	case $local_os_var in
+		*"BSD"*)
+		GROUP=wheel
+		;;
+		*"Darwin"*)
+		GROUP=admin
+		;;
+		*"MINGW32"*|*"CYGWIN"*)
+		USER=""
+		GROUP=""
+		;;
+		*)
+		GROUP=root
+		;;
+	esac
+
+	if ([ "$USER" != "" ] && [ "$(whoami)" != "$USER" ] && [ "$FAKEROOT" == "" ]); then
+	  	QuickLogger "Must be run as $USER."
+		exit 1
+	fi
+
+	OS=$(urlencode "$local_os_var")
+}
+
+function GetInit {
+	if [ -f /sbin/init ]; then
+		if file /sbin/init | grep systemd > /dev/null; then
+			init="systemd"
+		else
+			init="initV"
+		fi
+	else
+		QuickLogger "Can't detect initV or systemd. Service files won't be installed. You can still run $PROGRAM manually or via cron."
+		init="none"
+	fi
+}
+
+function CreateConfDir {
+	if [ ! -d "$CONF_DIR" ]; then
+		mkdir "$CONF_DIR"
+		if [ $? == 0 ]; then
+			QuickLogger "Created directory [$CONF_DIR]."
+		else
+			QuickLogger "Cannot create directory [$CONF_DIR]."
+			exit 1
+		fi
+	else
+		QuickLogger "Config directory [$CONF_DIR] exists."
+	fi
+}
+
+function CopyExampleFiles {
+	if [ -f "./sync.conf.example" ]; then
+		cp "./sync.conf.example" "$FAKEROOT/etc/$PROGRAM/sync.conf.example"
+	fi
+
+	if [ -f "./host_backup.conf.example" ]; then
+		cp "./host_backup.conf.example" "$FAKEROOT/etc/$PROGRAM/host_backup.conf.example"
+	fi
+
+	if [ -f "./exlude.list.example" ]; then
+		cp "./exclude.list.example" "$FAKEROOT/etc/$PROGRAM"
+	fi
+
+	if [ -f "./snapshot.conf.example" ]; then
+		cp "./snapshot.conf.example" "$FAKEROOT/etc/$PROGRAM/snapshot.conf.example"
+	fi
+}
+
+function CopyProgram {
+	cp "./$PROGRAM_BINARY" "$BIN_DIR"
+	if [ $? != 0 ]; then
+		QuickLogger "Cannot copy $PROGRAM_BINARY to [$BIN_DIR]. Make sure to run install script in the directory containing all other files."
+		QuickLogger "Also make sure you have permissions to write to [$BIN_DIR]."
+		exit 1
+	else
+		chmod 755 "$BIN_DIR/$PROGRAM_BINARY"
+		QuickLogger "Copied $PROGRAM_BINARY to [$BIN_DIR]."
+	fi
+
+	if [ -f "./$PROGRAM_BATCH" ]; then
+		cp "./$PROGRAM_BATCH" "$BIN_DIR"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy $PROGRAM_BATCH to [$BIN_DIR]."
+		else
+			chmod 755 "$BIN_DIR/$PROGRAM_BATCH"
+			QuickLogger "Copied $PROGRAM_BATCH to [$BIN_DIR]."
+		fi
+	fi
+
+	if [  -f "./ssh_filter.sh" ]; then
+		cp "./ssh_filter.sh" "$BIN_DIR"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy ssh_filter.sh to [$BIN_DIR]."
+		else
+			chmod 755 "$BIN_DIR/ssh_filter.sh"
+			if ([ "$USER" != "" ] && [ "$GROUP" != "" ] && [ "$FAKEROOT" == "" ]); then
+				chown $USER:$GROUP "$BIN_DIR/ssh_filter.sh"
+			fi
+			QuickLogger "Copied ssh_filter.sh to [$BIN_DIR]."
+		fi
+	fi
+}
+
+function CopyServiceFiles {
+	# OSYNC SPECIFIC
+	if ([ "$init" == "systemd" ] && [ -f "./$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then
+		cp "./$OSYNC_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM" && cp "./$OSYNC_SERVICE_FILE_SYSTEMD_USER" "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_SYSTEM"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy the systemd file to [$SERVICE_DIR_SYSTEMD_SYSTEM] or [$SERVICE_DIR_SYSTEMD_USER]."
+		else
+			QuickLogger "Created osync-srv service in [$SERVICE_DIR_SYSTEMD_SYSTEM] and [$SERVICE_DIR_SYSTEMD_USER]."
+			QuickLogger "Can be activated with [systemctl start osync-srv@instance.conf] where instance.conf is the name of the config file in /etc/osync."
+			QuickLogger "Can be enabled on boot with [systemctl enable osync-srv@instance.conf]."
+			QuickLogger "In userland, active with [systemctl --user start osync-srv@instance.conf]."
+		fi
+	elif ([ "$init" == "initV" ] && [ -f "./$OSYNC_SERVICE_FILE_INIT" ]); then
+		cp "./$OSYNC_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy osync-srv to [$SERVICE_DIR_INIT]."
+		else
+			chmod 755 "$SERVICE_DIR_INIT/$OSYNC_SERVICE_FILE_INIT"
+			QuickLogger "Created osync-srv service in [$SERVICE_DIR_INIT]."
+			QuickLogger "Can be activated with [service $OSYNC_SERVICE_FILE_INIT start]."
+			QuickLogger "Can be enabled on boot with [chkconfig $OSYNC_SERVICE_FILE_INIT on]."
+		fi
+	fi
+
+	# PMOCR SPECIFIC
+	if ([ "$init" == "systemd" ] && [ -f "./$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" ]); then
+		cp "./$PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_SYSTEM"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy the systemd file to [$SERVICE_DIR_SYSTEMD_SYSTEM] or [$SERVICE_DIR_SYSTEMD_USER]."
+		else
+			QuickLogger "Created pmocr-srv service in [$SERVICE_DIR_SYSTEMD_SYSTEM] and [$SERVICE_DIR_SYSTEMD_USER]."
+			QuickLogger "Can be activated with [systemctl start pmocr-srv] after configuring file options in [$BIN_DIR/$PROGRAM]."
+			QuickLogger "Can be enabled on boot with [systemctl enable pmocr-srv]."
+		fi
+	elif ([ "$init" == "initV" ] && [ -f "./$PMOCR_SERVICE_FILE_INIT" ]); then
+		cp "./$PMOCR_SERVICE_FILE_INIT" "$SERVICE_DIR_INIT"
+		if [ $? != 0 ]; then
+			QuickLogger "Cannot copy pmoct-srv to [$SERVICE_DIR_INIT]."
+		else
+			chmod 755 "$SERVICE_DIR_INIT/$PMOCR_SERVICE_FILE_INIT"
+			QuickLogger "Created osync-srv service in [$SERVICE_DIR_INIT]."
+			QuickLogger "Can be activated with [service $PMOCR_SERVICE_FILE_INIT start]."
+			QuickLogger "Can be enabled on boot with [chkconfig $PMOCR_SERVICE_FILE_INIT on]."
+		fi
+	fi
+}
+
+function Statistics {
+        if type wget > /dev/null; then
+                wget -qO- "$STATS_LINK" > /dev/null 2>&1
+                if [ $? == 0 ]; then
+                        return 0
+                fi
+	fi
+
+        if type curl > /dev/null; then
+                curl "$STATS_LINK" -o /dev/null > /dev/null 2>&1
+                if [ $? == 0 ]; then
+                        return 0
+                fi
+	fi
+
+       	QuickLogger "Neiter wget nor curl could be used for. Cannot run statistics. Use the provided link please."
+        return 1
+}
+
+function Usage {
+	echo "Installs $PROGRAM into $BIN_DIR"
+	echo "options:"
+	echo "--silent		Will log and bypass user interaction."
+	echo "--no-stats	Used with --silent in order to refuse sending anonymous install stats."
+	exit 127
+}
+
+_SILENT=0
+_STATS=1
+for i in "$@"
+do
+	case $i in
+		--silent)
+		_SILENT=1
+		;;
+		--no-stats)
+		_STATS=0
+		;;
+		--help|-h|-?)
+		Usage
+	esac
+done
+
+if [ "$FAKEROOT" != "" ]; then
+	mkdir -p "$SERVICE_DIR_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_USER" "$BIN_DIR"
+fi
+
+SetOSSettings
+CreateConfDir
+CopyExampleFiles
+CopyProgram
+GetInit
+CopyServiceFiles
+
+STATS_LINK="http://instcount.netpower.fr?program=$PROGRAM&version=$PROGRAM_VERSION&os=$OS"
+
+QuickLogger "$PROGRAM installed. Use with $BIN_DIR/$PROGRAM"
+if [ $_STATS -eq 1 ]; then
+	if [ $_SILENT -eq 1 ]; then
+		Statistics
+	else
+		QuickLogger "In order to make install statistics, the script would like to connect to $STATS_LINK"
+		read -r -p "No data except those in the url will be send. Allow [Y/n]" response
+		case $response in
+			[nN])
+			exit
+			;;
+			*)
+			Statistics
+			exit $?
+			;;
+		esac
+	fi
+fi

dev/debug_osync.sh

@@ -3,11 +3,11 @@
 PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
-PROGRAM_VERSION=1.1
-PROGRAM_BUILD=2016072701
+PROGRAM_VERSION=1.1.6-beta
+PROGRAM_BUILD=2016113001
 IS_STABLE=yes
 
-## FUNC_BUILD=2016071902
+## FUNC_BUILD=2016071902-i
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -24,6 +24,9 @@ KEEP_LOGGING=1801
 ## Correct output of sort command (language agnostic sorting)
 export LC_ALL=C
 
+## Default umask for file creation
+umask 0077
+
 # Standard alert mail body
 MAIL_ALERT_MSG="Execution of $PROGRAM instance $INSTANCE_ID on $(date) has warnings/errors."
 
@@ -47,14 +50,16 @@ fi						#__WITH_PARANOIA_DEBUG
 ## allow debugging from command line with _DEBUG=yes
 if [ ! "$_DEBUG" == "yes" ]; then
 	_DEBUG=no
-	SLEEP_TIME=.1
 	_VERBOSE=0
 else
-	SLEEP_TIME=1
 	trap 'TrapError ${LINENO} $?' ERR
 	_VERBOSE=1
 fi
 
+if [ "$SLEEP_TIME" == "" ]; then
+	SLEEP_TIME=.1
+fi
+
 SCRIPT_PID=$$
 
 LOCAL_USER=$(whoami)
@@ -80,7 +85,7 @@ fi
 
 
 # Default alert attachment filename
-ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log"
+ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$$.last.log"
 
 # Set error exit code if a piped command fails
 	set -o pipefail
@@ -123,14 +128,20 @@ function Logger {
 	if [ "$level" == "CRITICAL" ]; then
 		_Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "ERROR" ]; then
 		_Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "WARN" ]; then
 		_Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		WARN_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.warn.$SCRIPT_PID"
 		return
 	elif [ "$level" == "NOTICE" ]; then
 		_Logger "$prefix$value"
@@ -176,20 +187,35 @@ function QuickLogger {
 
 # Portable child (and grandchild) kill function tester under Linux, BSD and MacOS X
 function KillChilds {
-	local pid="${1}"
-	local self="${2:-false}"
+        local pid="${1}" # Parent pid to kill childs
+        local self="${2:-false}" # Should parent be killed too ?
 
+        # Paranoid checks, we can safely assume that $pid shouldn't be 0 nor 1
+        if [ $(IsNumeric "$pid") -eq 0 ] || [ "$pid" == "" ] || [ "$pid" == "0" ] || [ "$pid" == "1" ]; then
+                Logger "Bogus pid given [$pid]." "CRITICAL"
+                return 1
+        fi
+
+        if kill -0 "$pid" > /dev/null 2>&1; then
+                # Warning: pgrep is not native on cygwin, have this checked in CheckEnvironment
                 if children="$(pgrep -P "$pid")"; then
+                        if [[ "$pid" == *"$children"* ]]; then
+                                Logger "Bogus pgrep implementation." "CRITICAL"
+                                children="${children/$pid/}"
+                        fi
                         for child in $children; do
                                 Logger "Launching KillChilds \"$child\" true" "DEBUG"   #__WITH_PARANOIA_DEBUG
                                 KillChilds "$child" true
                         done
                 fi
+        fi
 
         # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
-	if ( [ "$self" == true ] && eval $PROCESS_TEST_CMD > /dev/null 2>&1); then
-		Logger "Sending SIGTERM to process [$pid]." "DEBUG"
-		kill -s SIGTERM "$pid"
+        if [ "$self" == true ]; then
+                # We need to check for pid again because it may have disappeared after recursive function call
+                if kill -0 "$pid" > /dev/null 2>&1; then
+                        kill -s TERM "$pid"
+                        Logger "Sent SIGTERM to process [$pid]." "DEBUG"
                         if [ $? != 0 ]; then
                                 sleep 15
                                 Logger "Sending SIGTERM to process [$pid] failed." "DEBUG"
@@ -197,9 +223,13 @@ function KillChilds {
                                 if [ $? != 0 ]; then
                                         Logger "Sending SIGKILL to process [$pid] failed." "DEBUG"
                                         return 1
-			fi
-		fi
+                                fi      # Simplify the return 0 logic here
+                        else
                                 return 0
+                        fi
+                else
+                        return 0
+                fi
         else
                 return 0
         fi
@@ -351,7 +381,7 @@ function SendAlert {
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
-		rm "$ALERT_LOG_FILE"
+		rm -f "$ALERT_LOG_FILE"
 	fi
 }
 
@@ -386,7 +416,7 @@ function SendEmail {
 	local auth_string=
 
 	if [ ! -f "$attachment" ]; then
-		attachment_command="-a $ALERT_LOG_FILE"
+		attachment_command="-a $attachment"
 		mail_no_attachment=1
 	else
 		mail_no_attachment=0
@@ -577,7 +607,7 @@ function StripQuotes {
 
 function EscapeSpaces {
 	local string="${1}" # String on which spaces will be escaped
-	echo "${string// /\ }"
+	echo "${string// /\\ }"
 }
 
 function IsNumeric {
@@ -767,10 +797,10 @@ function WaitForTaskCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -817,10 +847,16 @@ function WaitForCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
+				#if [ $? == 0 ]; then
+				#	Logger "Task stopped successfully" "NOTICE"
+				#	return 0
+				#else
+				#	return 1
+				#fi
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -1011,7 +1047,7 @@ function RsyncPatternsAdd {
 	local pattern="${2}"
 	__CheckArguments 2 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	local rest=
+	local rest
 
 	# Disable globbing so wildcards from exclusions do not get expanded
 	set -f
@@ -1041,8 +1077,6 @@ function RsyncPatternsFromAdd {
 	local pattern_from="${2}"
 	__CheckArguments 2 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
-	local pattern_from=
-
 	## Check if the exclude list has a full path, and if not, add the config file path if there is one
 	if [ "$(basename $pattern_from)" == "$pattern_from" ]; then
 		pattern_from="$(dirname $CONFIG_FILE)/$pattern_from"
@@ -1057,20 +1091,29 @@ function RsyncPatterns {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
        if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
-        elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
+	# Use default include first for quicksync runs
+	elif [ "$RSYNC_PATTERN_FIRST" == "include" ] || [ "$_QUICK_SYNC" == "2" ]; then
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "include" "$RSYNC_INCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
@@ -1195,9 +1238,9 @@ function PostInit {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
 	# Define remote commands
-        SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
-        SCP_CMD="$(type -p scp) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
-        RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
+	SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
+	SCP_CMD="$(type -p scp) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
+	RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
 }
 
 function InitLocalOSSettings {
@@ -1276,7 +1319,15 @@ function TrapStop {
 }
 
 function TrapQuit {
-	local exitcode=
+	local exitcode
+
+	# Get ERROR / WARN alert flags from subprocesses that call Logger
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.warn.$SCRIPT_PID" ]; then
+		WARN_ALERT=1
+	fi
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.error.$SCRIPT_PID" ]; then
+		ERROR_ALERT=1
+	fi
 
 	if [ $ERROR_ALERT -ne 0 ]; then
 		UnlockReplicas
@@ -1308,9 +1359,7 @@ function TrapQuit {
 		exitcode=240	# Special exit code for daemon mode not stopping on warnings
 	else
 		UnlockReplicas
-		if [ "$RUN_AFTER_CMD_ON_ERROR" == "yes" ]; then
 		RunAfterHook
-		fi
 		CleanUp
 		Logger "$PROGRAM finished." "NOTICE"
 		exitcode=0
@@ -1631,7 +1680,7 @@ function _CheckLocksRemote {
 	Logger "cmd: $cmd" "DEBUG"
 	eval "$cmd" &
 	WaitForTaskCompletion $! 720 1800 ${FUNCNAME[0]}
-	if [ $? != 0 ]; then
+	if [ $? == 0 ]; then
 		if [ -f "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" ]; then
 			lockfile_content=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)
 		else
@@ -1826,9 +1875,8 @@ function _get_file_ctime_mtime_local {
 	local file_list="${3}" # Contains list of files to get time attrs
 	__CheckArguments 3 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	#cat "$file_list" | xargs -I {} stat -c '%n;%Z;%Y' "$replica_path{}" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
 	echo -n "" > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
-	while read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
+	while read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort >> "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
 }
 
 function _get_file_ctime_mtime_remote {
@@ -1837,7 +1885,8 @@ function _get_file_ctime_mtime_remote {
 	local file_list="${3}"
 	__CheckArguments 3 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	local cmd=
+	local cmd
+
 	cmd='cat "'$file_list'" | '$SSH_CMD' "while read file; do '$REMOTE_STAT_CTIME_MTIME_CMD' \"'$replica_path'\$file\"; done | sort" > "'$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID'"'
 	Logger "CMD: $cmd" "DEBUG"
 	eval $cmd
@@ -2041,6 +2090,12 @@ function _delete_local {
 	do
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
 			if [ "$SOFT_DELETE" != "no" ]; then
+
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $replica_dir$files" "NOTICE"
+				fi
+
+				if [ $_DRYRUN -ne 1 ]; then
 					if [ ! -d "$replica_dir$deletion_dir" ]; then
 						mkdir -p "$replica_dir$deletion_dir"
 						if [ $? != 0 ]; then
@@ -2048,11 +2103,6 @@ function _delete_local {
 						fi
 					fi
 
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $replica_dir$files" "NOTICE"
-				fi
-
-				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$replica_dir$deletion_dir/$files" ]; then
 						rm -rf "${replica_dir:?}$deletion_dir/$files"
 					fi
@@ -2108,7 +2158,7 @@ function _delete_remote {
 
 	# Additionnaly, we need to copy the deletetion list to the remote state folder
 	esc_dest_dir="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$2\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$deleted_list_file\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -2119,12 +2169,12 @@ function _delete_remote {
 		exit 1
 	fi
 
-$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "$TARGET_STATE_DIR/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
+$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" SOFT_DELETE=$SOFT_DELETE DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
 
 	## The following lines are executed remotely
 	function _logger {
 		local value="${1}" # What to log
-		echo -e "$value" >> "$LOG_FILE"
+		echo -e "$value" >&2 # Log to STDERR
 
 		if [ $_SILENT -eq 0 ]; then
 		echo -e "$value"
@@ -2168,7 +2218,16 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 	IFS=$'\r\n'
 	for files in $(cat "$FILE_LIST")
 	do
+		Logger "Processing file [$file]." "DEBUG"
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
+
+			if [ "$SOFT_DELETE" != "no" ]; then
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
+				fi
+
+				Logger "Full path for deletion is [$REPLICA_DIR$DELETE_DIR/$files]." "DEBUG"
+
 				if [ ! -d "$REPLICA_DIR$DELETE_DIR" ]; then
 					$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR"
 					if [ $? != 0 ]; then
@@ -2176,24 +2235,19 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 					fi
 				fi
 
-			if [ "$SOFT_DELETE" != "no" ]; then
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
-				fi
-
 				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$REPLICA_DIR$DELETE_DIR/$files" ]; then
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files"
 					fi
 
-					if [ -e "$$REPLICA_DIR$files" ]; then
+					if [ -e "$REPLICA_DIR$files" ]; then
 						# In order to keep full path on soft deletion, create parent directories before move
 						parentdir="$(dirname "$files")"
 						if [ "$parentdir" != "." ]; then
 							$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR/$parentdir"
 							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR/$parentdir"
 						else
-							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"1
+							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"
 						fi
 						if [ $? != 0 ]; then
 							Logger "Cannot move $REPLICA_DIR$files to deletion directory." "ERROR"
@@ -2211,7 +2265,7 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$files"
 						if [ $? != 0 ]; then
 							Logger "Cannot delete $REPLICA_DIR$files" "ERROR"
-							echo "$files" >> "$TARGET_STATE_DIR/$FAILED_DELETE_LIST"
+							echo "$files" >> "$FAILED_DELETE_LIST"
 						fi
 					fi
 				fi
@@ -2227,7 +2281,7 @@ ENDSSH
 
 	## Copy back the deleted failed file list
 	esc_source_file="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -2307,8 +2361,6 @@ function Sync {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
 	Logger "Starting synchronization task." "NOTICE"
-	CheckConnectivity3rdPartyHosts
-	CheckConnectivityRemoteHost
 
 	if [ -f "${INITIATOR[7]}" ] && [ "$RESUME_SYNC" != "no" ]; then
 		resume_sync=$(cat "${INITIATOR[7]}")
@@ -2488,13 +2540,13 @@ function _SoftDeleteLocal {
 		fi
 			if [ $_VERBOSE -eq 1 ]; then
 			# Cannot launch log function from xargs, ugly hack
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
-			$FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 		fi
 			if [ $_DRYRUN -ne 1 ]; then
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} rm -f "{}" && $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -f "{}" && $COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
 		else
 			Dummy &
 		fi
@@ -2523,14 +2575,14 @@ function _SoftDeleteRemote {
 	CheckConnectivityRemoteHost
 
 	if [ $_DRYRUN -eq 1 ]; then
-		Logger "Listing files older than $change_time days on target replica. Does not remove anything." "NOTICE"
+		Logger "Listing files older than $change_time days on $replica_type replica. Does not remove anything." "NOTICE"
 	else
-		Logger "Removing files older than $change_time days on target replica." "NOTICE"
+		Logger "Removing files older than $change_time days on $replica_type replica." "NOTICE"
 	fi
 
 	if [ $_VERBOSE -eq 1 ]; then
 		# Cannot launch log function from xargs, ugly hack
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; exit 1; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
 		WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
@@ -2538,7 +2590,7 @@ function _SoftDeleteRemote {
 	fi
 
 	if [ $_DRYRUN -ne 1 ]; then
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} rm -f \"{}\" && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -f \"{}\" && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
@@ -2548,10 +2600,10 @@ function _SoftDeleteRemote {
 	WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
 	retval=$?
 	if [ $retval -ne 0 ]; then
-		Logger "Error while executing cleanup on remote target replica." "ERROR"
+		Logger "Error while executing cleanup on remote $replica_type replica." "ERROR"
 		Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 	else
-		Logger "Cleanup complete on target replica." "NOTICE"
+		Logger "Cleanup complete on $replica_type replica." "NOTICE"
 	fi
 }
 
@@ -2710,14 +2762,12 @@ function Init {
 	fi
 
 	## Add Rsync include / exclude patterns
-	if [ $_QUICK_SYNC -lt 2 ]; then
 	RsyncPatterns
-	fi
 
 	## Conflict options
 	if [ "$CONFLICT_BACKUP" != "no" ]; then
-		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[1]}${INITIATOR[4]}\""
-		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[1]}${TARGET[4]}\""
+		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[4]}\""
+		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[4]}\""
 		if [ "$CONFLICT_BACKUP_MULTIPLE" == "yes" ]; then
 			INITIATOR_BACKUP="$INITIATOR_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
 			TARGET_BACKUP="$TARGET_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
@@ -2893,7 +2943,6 @@ do
 		;;
 		--initiator=*)
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
-		no_maxtime=1
 		INITIATOR_SYNC_DIR=${i##*=}
 		opts=$opts" --initiator=\"$INITIATOR_SYNC_DIR\""
 		;;
@@ -2901,7 +2950,6 @@ do
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
 		TARGET_SYNC_DIR=${i##*=}
 		opts=$opts" --target=\"$TARGET_SYNC_DIR\""
-		no_maxtime=1
 		;;
 		--rsakey=*)
 		SSH_RSA_PRIVATE_KEY=${i##*=}
@@ -2964,6 +3012,10 @@ opts="${opts# *}"
 			HARD_MAX_EXEC_TIME=0
 		fi
 
+		if [ "$PATH_SEPARATOR_CHAR" == "" ]; then
+			PATH_SEPARATOR_CHAR=";"
+		fi
+
 		MIN_WAIT=30
 		REMOTE_OPERATION=no
 	else
@@ -3020,5 +3072,4 @@ opts="${opts# *}"
 		if [ $? == 0 ]; then
 			SoftDelete
 		fi
-		RunAfterHook
 	fi

dev/merge.sh

@@ -1,26 +1,38 @@
 #!/usr/bin/env bash
 
-## Merges ofunctions.sh and $PROGRAM
+## MERGE 2016080601-b
+
+## Merges ofunctions.sh and n_program.sh into program.sh
+## Adds installer
 
 PROGRAM=osync
 VERSION=$(grep "PROGRAM_VERSION=" n_$PROGRAM.sh)
 VERSION=${VERSION#*=}
-FUNC_PATH=/home/git/common
 
-PARANOIA_DEBUG_LINE="#__WITH_PARANOIA_DEBUG"
+PARANOIA_DEBUG_LINE="__WITH_PARANOIA_DEBUG"
 PARANOIA_DEBUG_BEGIN="#__BEGIN_WITH_PARANOIA_DEBUG"
 PARANOIA_DEBUG_END="#__END_WITH_PARANOIA_DEBUG"
+MINIMUM_FUNCTION_BEGIN="#### MINIMAL-FUNCTION-SET BEGIN ####"
+MINIMUM_FUNCTION_END="#### MINIMAL-FUNCTION-SET END ####"
 
 function Unexpand {
 	unexpand n_$PROGRAM.sh > tmp_$PROGRAM.sh
 }
 
-function Merge {
+function MergeAll {
 
-	sed "/source \"\.\/ofunctions.sh\"/r /home/git/common/ofunctions.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' > debug_$PROGRAM.sh
+	sed "/source \"\.\/ofunctions.sh\"/r ofunctions.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' > debug_$PROGRAM.sh
 	chmod +x debug_$PROGRAM.sh
 }
 
+function MergeMinimum {
+        sed -n "/$MINIMUM_FUNCTION_BEGIN/,/$MINIMUM_FUNCTION_END/p" ofunctions.sh > tmp_minimal.sh
+        sed "/source \"\.\/ofunctions.sh\"/r tmp_minimal.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' | grep -v "$PARANOIA_DEBUG_LINE" > debug_$PROGRAM.sh
+	rm -f tmp_minimal.sh
+        chmod +x debug_$PROGRAM.sh
+}
+
+
 function CleanDebug {
 
 # sed explanation
@@ -33,21 +45,27 @@ function CleanDebug {
 #}
 #p
 
-	sed -n '/'$PARANOIA_DEBUG_BEGIN'/{p; :a; N; /'$PARANOIA_DEBUG_END'/!ba; s/.*\n//}; p' debug_$PROGRAM.sh | grep -v "$PARANOIA_DEBUG_LINE" > ../$PROGRAM.sh
+	sed '/'$PARANOIA_DEBUG_BEGIN'/,/'$PARANOIA_DEBUG_END'/d' debug_$PROGRAM.sh | grep -v "$PARANOIA_DEBUG_LINE" > ../$PROGRAM.sh
 	chmod +x ../$PROGRAM.sh
 }
 
 function CopyCommons {
-        sed "s/\[prgname\]/$PROGRAM/g" /home/git/common/common_install.sh > ../tmp_install.sh
+	sed "s/\[prgname\]/$PROGRAM/g" common_install.sh > ../tmp_install.sh
 	sed "s/\[version\]/$VERSION/g" ../tmp_install.sh > ../install.sh
-        sed "s/\[prgname\]/$PROGRAM/g" /home/git/common/common_batch.sh > ../$PROGRAM-batch.sh
+	if [ -f "common_batch.sh" ]; then
+		sed "s/\[prgname\]/$PROGRAM/g" common_batch.sh > ../$PROGRAM-batch.sh
+	fi
 	chmod +x ../install.sh
 	chmod +x ../$PROGRAM-batch.sh
+	rm -f ../tmp_install.sh
 }
 
 Unexpand
-Merge
+if [ "$PROGRAM" == "osync" ] || [ "$PROGRAM" == "obackup" ]; then
+	MergeAll
+else
+	MergeMinimum
+fi
 CleanDebug
-rm -f tmp_$PROGRAM.sh
-rm -f ../tmp_install.sh
 CopyCommons
+rm -f tmp_$PROGRAM.sh

dev/n_osync.sh

@@ -3,8 +3,8 @@
 PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
-PROGRAM_VERSION=1.1
-PROGRAM_BUILD=2016072701
+PROGRAM_VERSION=1.1.6-rc1
+PROGRAM_BUILD=2017060801
 IS_STABLE=yes
 
 source "./ofunctions.sh"
@@ -28,7 +28,15 @@ function TrapStop {
 }
 
 function TrapQuit {
-	local exitcode=
+	local exitcode
+
+	# Get ERROR / WARN alert flags from subprocesses that call Logger
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.warn.$SCRIPT_PID" ]; then
+		WARN_ALERT=1
+	fi
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.error.$SCRIPT_PID" ]; then
+		ERROR_ALERT=1
+	fi
 
 	if [ $ERROR_ALERT -ne 0 ]; then
 		UnlockReplicas
@@ -60,9 +68,7 @@ function TrapQuit {
 		exitcode=240	# Special exit code for daemon mode not stopping on warnings
 	else
 		UnlockReplicas
-		if [ "$RUN_AFTER_CMD_ON_ERROR" == "yes" ]; then
 		RunAfterHook
-		fi
 		CleanUp
 		Logger "$PROGRAM finished." "NOTICE"
 		exitcode=0
@@ -383,7 +389,7 @@ function _CheckLocksRemote {
 	Logger "cmd: $cmd" "DEBUG"
 	eval "$cmd" &
 	WaitForTaskCompletion $! 720 1800 ${FUNCNAME[0]}
-	if [ $? != 0 ]; then
+	if [ $? == 0 ]; then
 		if [ -f "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" ]; then
 			lockfile_content=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)
 		else
@@ -514,9 +520,9 @@ function tree_list {
 	if [ "$REMOTE_OPERATION" == "yes" ] && [ "$replica_type" == "${TARGET[0]}" ]; then
 		CheckConnectivity3rdPartyHosts
 		CheckConnectivityRemoteHost
-		rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $RSYNC_ARGS $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS -8 --exclude \"$OSYNC_DIR\" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE -e \"$RSYNC_SSH_CMD\" --list-only $REMOTE_USER@$REMOTE_HOST:\"$escaped_replica_path/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/$PROGRAM.$replica_type.$SCRIPT_PID\" &"
+		rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $RSYNC_ARGS $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS -8 --exclude \"$OSYNC_DIR\" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE -e \"$RSYNC_SSH_CMD\" --list-only $REMOTE_USER@$REMOTE_HOST:\"$escaped_replica_path/\" | grep \"^-\|^d\" | sed -r 's/^.{10} +[0-9,]+ [0-9/]{10} [0-9:]{8} //' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/$PROGRAM.$replica_type.$SCRIPT_PID\" &"
 	else
-		rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $RSYNC_ARGS $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS -8 --exclude \"$OSYNC_DIR\" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --list-only \"$replica_path/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/$PROGRAM.$replica_type.$SCRIPT_PID\" &"
+		rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $RSYNC_ARGS $RSYNC_ATTR_ARGS $RSYNC_TYPE_ARGS -8 --exclude \"$OSYNC_DIR\" $RSYNC_PATTERNS $RSYNC_PARTIAL_EXCLUDE --list-only \"$replica_path/\" | grep \"^-\|^d\" | sed -r 's/^.{10} +[0-9,]+ [0-9/]{10} [0-9:]{8} //' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/$PROGRAM.$replica_type.$SCRIPT_PID\" &"
 	fi
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	## Redirect commands stderr here to get rsync stderr output in logfile with eval "$rsync_cmd" 2>> "$LOG_FILE"
@@ -578,9 +584,8 @@ function _get_file_ctime_mtime_local {
 	local file_list="${3}" # Contains list of files to get time attrs
 	__CheckArguments 3 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	#cat "$file_list" | xargs -I {} stat -c '%n;%Z;%Y' "$replica_path{}" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
 	echo -n "" > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
-	while read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
+	while IFS='' read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort >> "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
 }
 
 function _get_file_ctime_mtime_remote {
@@ -589,8 +594,9 @@ function _get_file_ctime_mtime_remote {
 	local file_list="${3}"
 	__CheckArguments 3 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	local cmd=
-	cmd='cat "'$file_list'" | '$SSH_CMD' "while read file; do '$REMOTE_STAT_CTIME_MTIME_CMD' \"'$replica_path'\$file\"; done | sort" > "'$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID'"'
+	local cmd
+
+	cmd='cat "'$file_list'" | '$SSH_CMD' "while IFS=\"\" read file; do '$REMOTE_STAT_CTIME_MTIME_CMD' \"'$replica_path'\$file\"; done | sort" > "'$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID'"'
 	Logger "CMD: $cmd" "DEBUG"
 	eval $cmd
 	WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
@@ -793,6 +799,12 @@ function _delete_local {
 	do
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
 			if [ "$SOFT_DELETE" != "no" ]; then
+
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $replica_dir$files" "NOTICE"
+				fi
+
+				if [ $_DRYRUN -ne 1 ]; then
 					if [ ! -d "$replica_dir$deletion_dir" ]; then
 						mkdir -p "$replica_dir$deletion_dir"
 						if [ $? != 0 ]; then
@@ -800,11 +812,6 @@ function _delete_local {
 						fi
 					fi
 
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $replica_dir$files" "NOTICE"
-				fi
-
-				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$replica_dir$deletion_dir/$files" ]; then
 						rm -rf "${replica_dir:?}$deletion_dir/$files"
 					fi
@@ -860,7 +867,7 @@ function _delete_remote {
 
 	# Additionnaly, we need to copy the deletetion list to the remote state folder
 	esc_dest_dir="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$2\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$deleted_list_file\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -871,12 +878,12 @@ function _delete_remote {
 		exit 1
 	fi
 
-$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "$TARGET_STATE_DIR/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
+$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" SOFT_DELETE=$SOFT_DELETE DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
 
 	## The following lines are executed remotely
 	function _logger {
 		local value="${1}" # What to log
-		echo -e "$value" >> "$LOG_FILE"
+		echo -e "$value" >&2 # Log to STDERR
 
 		if [ $_SILENT -eq 0 ]; then
 		echo -e "$value"
@@ -920,7 +927,16 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 	IFS=$'\r\n'
 	for files in $(cat "$FILE_LIST")
 	do
+		Logger "Processing file [$file]." "DEBUG"
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
+
+			if [ "$SOFT_DELETE" != "no" ]; then
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
+				fi
+
+				Logger "Full path for deletion is [$REPLICA_DIR$DELETE_DIR/$files]." "DEBUG"
+
 				if [ ! -d "$REPLICA_DIR$DELETE_DIR" ]; then
 					$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR"
 					if [ $? != 0 ]; then
@@ -928,24 +944,19 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 					fi
 				fi
 
-			if [ "$SOFT_DELETE" != "no" ]; then
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
-				fi
-
 				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$REPLICA_DIR$DELETE_DIR/$files" ]; then
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files"
 					fi
 
-					if [ -e "$$REPLICA_DIR$files" ]; then
+					if [ -e "$REPLICA_DIR$files" ]; then
 						# In order to keep full path on soft deletion, create parent directories before move
 						parentdir="$(dirname "$files")"
 						if [ "$parentdir" != "." ]; then
 							$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR/$parentdir"
 							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR/$parentdir"
 						else
-							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"1
+							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"
 						fi
 						if [ $? != 0 ]; then
 							Logger "Cannot move $REPLICA_DIR$files to deletion directory." "ERROR"
@@ -963,7 +974,7 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$files"
 						if [ $? != 0 ]; then
 							Logger "Cannot delete $REPLICA_DIR$files" "ERROR"
-							echo "$files" >> "$TARGET_STATE_DIR/$FAILED_DELETE_LIST"
+							echo "$files" >> "$FAILED_DELETE_LIST"
 						fi
 					fi
 				fi
@@ -979,7 +990,7 @@ ENDSSH
 
 	## Copy back the deleted failed file list
 	esc_source_file="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -1059,8 +1070,6 @@ function Sync {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
 	Logger "Starting synchronization task." "NOTICE"
-	CheckConnectivity3rdPartyHosts
-	CheckConnectivityRemoteHost
 
 	if [ -f "${INITIATOR[7]}" ] && [ "$RESUME_SYNC" != "no" ]; then
 		resume_sync=$(cat "${INITIATOR[7]}")
@@ -1240,13 +1249,13 @@ function _SoftDeleteLocal {
 		fi
 			if [ $_VERBOSE -eq 1 ]; then
 			# Cannot launch log function from xargs, ugly hack
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
-			$FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 		fi
 			if [ $_DRYRUN -ne 1 ]; then
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} rm -f "{}" && $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -f "{}" && $COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
 		else
 			Dummy &
 		fi
@@ -1275,14 +1284,14 @@ function _SoftDeleteRemote {
 	CheckConnectivityRemoteHost
 
 	if [ $_DRYRUN -eq 1 ]; then
-		Logger "Listing files older than $change_time days on target replica. Does not remove anything." "NOTICE"
+		Logger "Listing files older than $change_time days on $replica_type replica. Does not remove anything." "NOTICE"
 	else
-		Logger "Removing files older than $change_time days on target replica." "NOTICE"
+		Logger "Removing files older than $change_time days on $replica_type replica." "NOTICE"
 	fi
 
 	if [ $_VERBOSE -eq 1 ]; then
 		# Cannot launch log function from xargs, ugly hack
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; exit 1; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
 		WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
@@ -1290,7 +1299,7 @@ function _SoftDeleteRemote {
 	fi
 
 	if [ $_DRYRUN -ne 1 ]; then
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} rm -f \"{}\" && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -f \"{}\" && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
@@ -1300,10 +1309,10 @@ function _SoftDeleteRemote {
 	WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
 	retval=$?
 	if [ $retval -ne 0 ]; then
-		Logger "Error while executing cleanup on remote target replica." "ERROR"
+		Logger "Error while executing cleanup on remote $replica_type replica." "ERROR"
 		Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 	else
-		Logger "Cleanup complete on target replica." "NOTICE"
+		Logger "Cleanup complete on $replica_type replica." "NOTICE"
 	fi
 }
 
@@ -1462,14 +1471,12 @@ function Init {
 	fi
 
 	## Add Rsync include / exclude patterns
-	if [ $_QUICK_SYNC -lt 2 ]; then
 	RsyncPatterns
-	fi
 
 	## Conflict options
 	if [ "$CONFLICT_BACKUP" != "no" ]; then
-		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[1]}${INITIATOR[4]}\""
-		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[1]}${TARGET[4]}\""
+		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[4]}\""
+		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[4]}\""
 		if [ "$CONFLICT_BACKUP_MULTIPLE" == "yes" ]; then
 			INITIATOR_BACKUP="$INITIATOR_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
 			TARGET_BACKUP="$TARGET_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
@@ -1645,7 +1652,6 @@ do
 		;;
 		--initiator=*)
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
-		no_maxtime=1
 		INITIATOR_SYNC_DIR=${i##*=}
 		opts=$opts" --initiator=\"$INITIATOR_SYNC_DIR\""
 		;;
@@ -1653,7 +1659,6 @@ do
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
 		TARGET_SYNC_DIR=${i##*=}
 		opts=$opts" --target=\"$TARGET_SYNC_DIR\""
-		no_maxtime=1
 		;;
 		--rsakey=*)
 		SSH_RSA_PRIVATE_KEY=${i##*=}
@@ -1716,6 +1721,10 @@ opts="${opts# *}"
 			HARD_MAX_EXEC_TIME=0
 		fi
 
+		if [ "$PATH_SEPARATOR_CHAR" == "" ]; then
+			PATH_SEPARATOR_CHAR=";"
+		fi
+
 		MIN_WAIT=30
 		REMOTE_OPERATION=no
 	else
@@ -1772,5 +1781,4 @@ opts="${opts# *}"
 		if [ $? == 0 ]; then
 			SoftDelete
 		fi
-		RunAfterHook
 	fi

dev/ofunctions.sh

@@ -1,4 +1,4 @@
-## FUNC_BUILD=2016071902
+## FUNC_BUILD=2016071902-j
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -15,6 +15,9 @@ KEEP_LOGGING=1801
 ## Correct output of sort command (language agnostic sorting)
 export LC_ALL=C
 
+## Default umask for file creation
+umask 0077
+
 # Standard alert mail body
 MAIL_ALERT_MSG="Execution of $PROGRAM instance $INSTANCE_ID on $(date) has warnings/errors."
 
@@ -38,14 +41,16 @@ fi						#__WITH_PARANOIA_DEBUG
 ## allow debugging from command line with _DEBUG=yes
 if [ ! "$_DEBUG" == "yes" ]; then
 	_DEBUG=no
-	SLEEP_TIME=.1
 	_VERBOSE=0
 else
-	SLEEP_TIME=1
 	trap 'TrapError ${LINENO} $?' ERR
 	_VERBOSE=1
 fi
 
+if [ "$SLEEP_TIME" == "" ]; then
+	SLEEP_TIME=.1
+fi
+
 SCRIPT_PID=$$
 
 LOCAL_USER=$(whoami)
@@ -71,7 +76,7 @@ fi
 
 
 # Default alert attachment filename
-ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log"
+ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$$.last.log"
 
 # Set error exit code if a piped command fails
 	set -o pipefail
@@ -114,14 +119,20 @@ function Logger {
 	if [ "$level" == "CRITICAL" ]; then
 		_Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "ERROR" ]; then
 		_Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "WARN" ]; then
 		_Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		WARN_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.warn.$SCRIPT_PID"
 		return
 	elif [ "$level" == "NOTICE" ]; then
 		_Logger "$prefix$value"
@@ -167,20 +178,35 @@ function QuickLogger {
 
 # Portable child (and grandchild) kill function tester under Linux, BSD and MacOS X
 function KillChilds {
-	local pid="${1}"
-	local self="${2:-false}"
+        local pid="${1}" # Parent pid to kill childs
+        local self="${2:-false}" # Should parent be killed too ?
 
+        # Paranoid checks, we can safely assume that $pid shouldn't be 0 nor 1
+        if [ $(IsNumeric "$pid") -eq 0 ] || [ "$pid" == "" ] || [ "$pid" == "0" ] || [ "$pid" == "1" ]; then
+                Logger "Bogus pid given [$pid]." "CRITICAL"
+                return 1
+        fi
+
+        if kill -0 "$pid" > /dev/null 2>&1; then
+                # Warning: pgrep is not native on cygwin, have this checked in CheckEnvironment
                 if children="$(pgrep -P "$pid")"; then
+                        if [[ "$pid" == *"$children"* ]]; then
+                                Logger "Bogus pgrep implementation." "CRITICAL"
+                                children="${children/$pid/}"
+                        fi
                         for child in $children; do
                                 Logger "Launching KillChilds \"$child\" true" "DEBUG"   #__WITH_PARANOIA_DEBUG
                                 KillChilds "$child" true
                         done
                 fi
+        fi
 
         # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
-	if ( [ "$self" == true ] && eval $PROCESS_TEST_CMD > /dev/null 2>&1); then
-		Logger "Sending SIGTERM to process [$pid]." "DEBUG"
-		kill -s SIGTERM "$pid"
+        if [ "$self" == true ]; then
+                # We need to check for pid again because it may have disappeared after recursive function call
+                if kill -0 "$pid" > /dev/null 2>&1; then
+                        kill -s TERM "$pid"
+                        Logger "Sent SIGTERM to process [$pid]." "DEBUG"
                         if [ $? != 0 ]; then
                                 sleep 15
                                 Logger "Sending SIGTERM to process [$pid] failed." "DEBUG"
@@ -188,9 +214,13 @@ function KillChilds {
                                 if [ $? != 0 ]; then
                                         Logger "Sending SIGKILL to process [$pid] failed." "DEBUG"
                                         return 1
-			fi
-		fi
+                                fi      # Simplify the return 0 logic here
+                        else
                                 return 0
+                        fi
+                else
+                        return 0
+                fi
         else
                 return 0
         fi
@@ -342,7 +372,7 @@ function SendAlert {
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
-		rm "$ALERT_LOG_FILE"
+		rm -f "$ALERT_LOG_FILE"
 	fi
 }
 
@@ -377,7 +407,7 @@ function SendEmail {
 	local auth_string=
 
 	if [ ! -f "$attachment" ]; then
-		attachment_command="-a $ALERT_LOG_FILE"
+		attachment_command="-a $attachment"
 		mail_no_attachment=1
 	else
 		mail_no_attachment=0
@@ -568,7 +598,7 @@ function StripQuotes {
 
 function EscapeSpaces {
 	local string="${1}" # String on which spaces will be escaped
-	echo "${string// /\ }"
+	echo "${string// /\\ }"
 }
 
 function IsNumeric {
@@ -636,7 +666,7 @@ function GetLocalOS {
 		*"BSD"*)
 		LOCAL_OS="BSD"
 		;;
-		*"MINGW32"*|*"CYGWIN"*)
+		*"MINGW32"*|*"MINGW64"*|*"MSYS"*|*"CYGWIN"*)
 		LOCAL_OS="msys"
 		;;
 		*"Darwin"*)
@@ -696,7 +726,7 @@ function GetRemoteOS {
 			*"BSD"*)
 			REMOTE_OS="BSD"
 			;;
-			*"MINGW32"*|*"CYGWIN"*)
+			*"MINGW32"*|*"MINGW64"*|*"MSYS"*|*"CYGWIN"*)
 			REMOTE_OS="msys"
 			;;
 			*"Darwin"*)
@@ -758,10 +788,10 @@ function WaitForTaskCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -808,10 +838,16 @@ function WaitForCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
+				#if [ $? == 0 ]; then
+				#	Logger "Task stopped successfully" "NOTICE"
+				#	return 0
+				#else
+				#	return 1
+				#fi
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -1002,7 +1038,7 @@ function RsyncPatternsAdd {
 	local pattern="${2}"
 	__CheckArguments 2 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
-	local rest=
+	local rest
 
 	# Disable globbing so wildcards from exclusions do not get expanded
 	set -f
@@ -1032,8 +1068,6 @@ function RsyncPatternsFromAdd {
 	local pattern_from="${2}"
 	__CheckArguments 2 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
-	local pattern_from=
-
 	## Check if the exclude list has a full path, and if not, add the config file path if there is one
 	if [ "$(basename $pattern_from)" == "$pattern_from" ]; then
 		pattern_from="$(dirname $CONFIG_FILE)/$pattern_from"
@@ -1048,20 +1082,29 @@ function RsyncPatterns {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
        if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
-        elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
+	# Use default include first for quicksync runs
+	elif [ "$RSYNC_PATTERN_FIRST" == "include" ] || [ "$_QUICK_SYNC" == "2" ]; then
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "include" "$RSYNC_INCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
@@ -1186,9 +1229,9 @@ function PostInit {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"    #__WITH_PARANOIA_DEBUG
 
 	# Define remote commands
-        SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
-        SCP_CMD="$(type -p scp) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
-        RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
+	SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
+	SCP_CMD="$(type -p scp) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
+	RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
 }
 
 function InitLocalOSSettings {

dev/tests/conf/local.conf

@@ -0,0 +1,185 @@
+#!/usr/bin/env bash
+
+###### 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 2016102101
+
+## ---------- GENERAL OPTIONS
+
+## Sync job identification
+INSTANCE_ID="local"
+
+## Directories to synchronize.
+## Initiator is the system osync runs on. The initiator directory must be a local path.
+INITIATOR_SYNC_DIR="${HOME}/osync-tests/initiator"
+
+## Target is the system osync synchronizes to (can be the same system as the initiator in case of local sync tasks). The target directory can be a local or remote path.
+TARGET_SYNC_DIR="${HOME}/osync-tests/target"
+#TARGET_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
+
+## If the target system is remote, you can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
+SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
+
+## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed.
+SSH_PASSWORD_FILE=""
+
+## Create sync directories if they do not exist
+CREATE_DIRS=no
+
+## Log file location. Leaving this empty will create a logfile at /var/log/osync_version_SYNC_ID.log (or current directory if /var/log doesn't exist)
+LOGFILE=""
+
+## Generate an alert if initiator or target replicas have less free space than given value in KB. Set this to zero to skip disk space tests. 
+MINIMUM_SPACE=10240
+
+## Bandwidth limit Kbytes / second. Leave 0 to disable limitation
+BANDWIDTH=0
+
+## If enabled, synchronization on remote system will be processed as superuser. See documentation for /etc/sudoers file configuration.
+SUDO_EXEC=no
+## Paranoia option. Don't change this unless you read the documentation.
+RSYNC_EXECUTABLE=rsync
+## Remote rsync executable path. Leave this empty in most cases
+RSYNC_REMOTE_PATH=""
+
+## Rsync exclude / include order (the option set here will be set first, eg: include will make include then exclude patterns)
+RSYNC_PATTERN_FIRST=include
+
+## List of files / directories to incldue / exclude from sync on both sides (see rsync patterns, wildcards work).
+## Paths are relative to sync dirs. List elements are separated by a semicolon.
+RSYNC_INCLUDE_PATTERN=""
+RSYNC_EXCLUDE_PATTERN="*.php"
+#RSYNC_EXCLUDE_PATTERN="tmp;archives"
+
+## Files that contains lists of files / directories to include / exclude from sync on both sides. Leave this empty if you don't want to use an exclusion file.
+## This file has to be in the same directory as the config file
+## Paths are relative to sync dirs. One element per line.
+RSYNC_INCLUDE_FROM=""
+RSYNC_EXCLUDE_FROM=""
+#RSYNC_EXCLUDE_FROM="exclude.list"
+
+## List elements separator char.  You may set an alternative separator char for your directories lists above.
+PATH_SEPARATOR_CHAR=";"
+
+## ---------- REMOTE SYNC OPTIONS
+
+## ssh compression should be used unless your remote connection is good enough (LAN)
+SSH_COMPRESSION=yes
+
+## Ignore ssh known hosts. DANGER WILL ROBINSON DANGER ! This can lead to security issues. Only enable this if you know what you're doing.
+SSH_IGNORE_KNOWN_HOSTS=no
+
+## Check for connectivity to remote host before launching remote sync task. Be sure the hosts responds to ping. Failing to ping will stop sync.
+REMOTE_HOST_PING=no
+
+## Check for internet access by pinging one or more 3rd party hosts before remote sync task. Leave empty if you don't want this check to be be performed. Failing to ping will stop sync.
+## If you use this function, you should set more than one 3rd party host, and be sure you can ping them.
+## Be aware some DNS like opendns redirect false hostnames. Also, this adds an extra execution time of a bit less than a minute.
+REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com"
+
+## ---------- MISC OPTIONS
+
+## Preserve basic linux permissions
+PRESERVE_PERMISSIONS=yes
+PRESERVE_OWNER=yes
+PRESERVE_GROUP=yes
+## On MACOS X, does not work and will be ignored
+PRESERVE_EXECUTABILITY=yes
+
+## Preserve ACLS. Make sure source and target FS can manage same ACLs or you'll get loads of errors.
+PRESERVE_ACL=yes
+## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.
+PRESERVE_XATTR=yes
+## Transforms symlinks into referent files/dirs
+COPY_SYMLINKS=no
+## Treat symlinked dirs	as dirs. CAUTION: This also follows symlinks outside of the replica root.
+KEEP_DIRLINKS=no
+## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them.
+PRESERVE_HARDLINKS=no
+## Do a full checksum on all files that have identical sizes, they are checksummed to see if they actually are identical. This can take a long time.
+CHECKSUM=no
+
+## Let RSYNC compress file transfers. Do not use this if both initator and target replicas are on local system. Also,  do not use this if you already enabled SSH compression.
+RSYNC_COMPRESS=yes
+
+## Maximum execution time (in seconds) for sync process. Set these values zero will disable max execution times.
+## Soft exec time only generates a warning. Hard exec time will generate a warning and stop sync process.
+SOFT_MAX_EXEC_TIME=7200
+HARD_MAX_EXEC_TIME=10600
+
+## Log a message every KEEP_LOGGING seconds just to know the task is still alive
+KEEP_LOGGING=1801
+
+## Minimum time (in seconds) in file monitor /daemon mode between modification detection and sync task in order to let copy operations finish.
+MIN_WAIT=60
+
+## Maximum time (in seconds) waiting in file monitor / daemon mode. After this time, sync is run.
+## Use 0 to wait indefinitely.
+MAX_WAIT=7200
+
+## ---------- BACKUP AND DELETION OPTIONS
+
+## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
+CONFLICT_BACKUP=yes
+## Keep multiple backup versions of the same file. Warning, This can be very space consuming.
+CONFLICT_BACKUP_MULTIPLE=no
+## Osync will clean backup files after a given number of days. Setting this to 0 will disable cleaning and keep backups forever. Warning: This can be very space consuming.
+CONFLICT_BACKUP_DAYS=30
+## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica.
+CONFLICT_PREVALANCE=initiator
+
+## On deletion propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted
+SOFT_DELETE=yes
+## Osync will clean deleted files after a given number of days. Setting this to 0 will disable cleaning and keep deleted files forever. Warning: This can be very space consuming.
+SOFT_DELETE_DAYS=30
+
+## Optional deletion skip on replicas. Valid values are "initiator", "target", or "initiator,target"
+SKIP_DELETION=
+
+## ---------- RESUME OPTIONS
+
+## Try to resume an aborted sync task
+RESUME_SYNC=yes
+## Number maximum resume tries before initiating a fresh sync.
+RESUME_TRY=2
+## When a pidlock exists on slave replica that does not correspond to the initiator's instance-id, force pidlock removal. Be careful with this option if you have multiple initiators.
+FORCE_STRANGER_LOCK_RESUME=no
+
+## Keep partial uploads that can be resumed on next run, experimental feature
+PARTIAL=no
+
+## Use delta copy algortithm (usefull when local paths are network drives), defaults to yes
+DELTA_COPIES=yes
+
+## ---------- ALERT OPTIONS
+
+## List of alert mails separated by spaces
+DESTINATION_MAILS=""
+
+## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/)
+SENDER_MAIL="alert@your.system.tld"
+SMTP_SERVER=smtp.your.isp.tld
+SMTP_PORT=25
+# encryption can be tls, ssl or none
+SMTP_ENCRYPTION=none
+SMTP_USER=
+SMTP_PASSWORD=
+
+## ---------- EXECUTION HOOKS
+
+## Commands can will be run before and / or after sync process (remote execution will only happen if REMOTE_OPERATION is set).
+LOCAL_RUN_BEFORE_CMD=""
+LOCAL_RUN_AFTER_CMD=""
+
+REMOTE_RUN_BEFORE_CMD=""
+REMOTE_RUN_AFTER_CMD=""
+
+## Max execution time of commands before they get force killed. Leave 0 if you don't wan't this to happen. Time is specified in seconds.
+MAX_EXEC_TIME_PER_CMD_BEFORE=0
+MAX_EXEC_TIME_PER_CMD_AFTER=0
+
+## Stops osync execution if one of the above commands fail
+STOP_ON_CMD_ERROR=yes
+
+## Run local and remote after sync commands even on failure
+RUN_AFTER_CMD_ON_ERROR=no

dev/tests/conf/old.conf

@@ -1,20 +1,17 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 ###### Osync - Rsync based two way sync engine with fault tolerance
-###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
-###### Config file rev 2611201401
+###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr)
+#### Config file rev 0211201302
 
 ## ---------- GENERAL OPTIONS
 
 ## Sync job identification
-SYNC_ID="sync_test"
+SYNC_ID="old"
 
-## Directories to synchronize. Master must be on the system Osync runs on. Slave can be either a local directory, or a remote one.
-MASTER_SYNC_DIR="master"
-SLAVE_SYNC_DIR="slave"
-#SLAVE_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
-## If slave replica is a remote directory, you must specify a RSA key (please use full path). Please see documentation for further information.
-#SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
+## Directories to synchronize. Master must be on the system Osync runs on. Slave can be either on the same system, or on a remote one.
+MASTER_SYNC_DIR="${HOME}/osync-tests/initiator"
+SLAVE_SYNC_DIR="${HOME}/osync-tests/target"
 
 ## Create sync directories if they do not exist
 CREATE_DIRS=no
@@ -22,19 +19,10 @@ CREATE_DIRS=no
 ## Log file location. Leaving this empty will create a logfile at /var/log/osync_version_SYNC_ID.log (or current directory if /var/log doesn't exist)
 LOGFILE=""
 
-
 ## List of directories to exclude from sync on both sides (rsync patterns, wildcards work).
 ## Paths are relative to sync dirs. List elements are separated by a semicolon.
-RSYNC_EXCLUDE_PATTERN=""
-#RSYNC_EXCLUDE_PATTERN="tmp;archives"
-
-## File that contains the list of directories or files to exclude from sync on both sides. Leave this empty if you don't want to use an exclusion file.
-## This file has to be in the same directory as the config file
-## Paths are relative to sync dirs. One element per line.
-RSYNC_EXCLUDE_FROM=""
-#RSYNC_EXCLUDE_FROM="exclude.list"
-
-## List elements separator char.  You may set an alternative separator char for your directories lists above.
+RSYNC_EXCLUDE_PATTERN="tmp;archives"
+## List elements separator char.  You may set an alternative seperator char for your directories lists above.
 PATH_SEPARATOR_CHAR=";"
 
 ## Generate an alert if master or slave replicas have less free space than given value in KB.
@@ -43,13 +31,20 @@ MINIMUM_SPACE=10240
 ## Bandwidth limit Kbytes / second. Leave 0 to disable limitation
 BANDWIDTH=0
 
-## If enabled, synchronization on remote system will be processed as superuser. See documentation for /etc/sudoers file configuration.
+## If enabled, synchronization will be processed as superuser. See documentation for /etc/sudoers file configuration.
 SUDO_EXEC=no
 ## Paranoia option. Don't change this unless you read the documentation.
 RSYNC_EXECUTABLE=rsync
 
 ## ---------- REMOTE SYNC OPTIONS
 
+## The following options allow Osync to sync a slave replica on a remote system via an SSH tunnel.
+## Needs public RSA key need to be put into ~/.ssh/authorized_keys in remote users home directory. See documentation for remote sync.
+REMOTE_SYNC=no
+SSH_RSA_PRIVATE_KEY=~/.ssh/id_rsa
+REMOTE_USER=syncuser
+REMOTE_HOST=your-remote-host.tld
+REMOTE_PORT=22
 ## ssh compression should be used unless your remote connection is good enough (LAN)
 SSH_COMPRESSION=yes
 
@@ -59,10 +54,10 @@ REMOTE_HOST_PING=no
 ## Check for internet access by pinging one or more 3rd party hosts before remote sync task. Leave empty if you don't want this check to be be performed. Failing to ping will stop sync.
 ## If you use this function, you should set more than one 3rd party host, and be sure you can ping them.
 ## Be aware some DNS like opendns redirect false hostnames. Also, this adds an extra execution time of a bit less than a minute.
-REMOTE_3RD_PARTY_HOSTS=""
+REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.fr"
 
 ## Remote rsync executable path. Leave this empty in most cases
-RSYNC_REMOTE_PATH=""
+REMOTE_RSYNC_PATH=""
 
 ## ---------- MISC OPTIONS
 
@@ -70,12 +65,6 @@ RSYNC_REMOTE_PATH=""
 PRESERVE_ACL=no
 ## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.
 PRESERVE_XATTR=no
-## Transforms symlinks into referent files/dirs
-COPY_SYMLINKS=no
-## Treat symlinked dirs	as dirs. CAUTION: This also follows symlinks outside of the replica root.
-KEEP_DIRLINKS=no
-## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them.
-PRESERVE_HARDLINKS=no
 
 ## Let RSYNC compress file transfers. Do not use this if both master and slave replicas are on local system. Also,  do not use this if you already enabled SSH compression.
 RSYNC_COMPRESS=yes
@@ -84,10 +73,7 @@ RSYNC_COMPRESS=yes
 SOFT_MAX_EXEC_TIME=7200
 HARD_MAX_EXEC_TIME=10600
 
-## Minimum time (in seconds) in file monitor /daemon mode between modification detection and sync task in order to let copy operations finish.
-MIN_WAIT=60
-
-## ---------- BACKUP AND DELETION OPTIONS
+## ---------- BACKUP AND TRASH OPTIONS
 
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
@@ -98,7 +84,7 @@ CONFLICT_BACKUP_DAYS=30
 ## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica.
 CONFLICT_PREVALANCE=master
 
-## On deletion propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted
+## On deletition propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted
 SOFT_DELETE=yes
 ## Osync will clean deleted files after a given number of days. Setting this to 0 will disable cleaning and keep deleted files forever. Warning: This can be very space consuming.
 SOFT_DELETE_DAYS=30
@@ -107,22 +93,19 @@ SOFT_DELETE_DAYS=30
 
 ## Try to resume an aborted sync task
 RESUME_SYNC=yes
-## Number maximum resume tries before initiating a fresh sync.
+## Number maximum resume tries before initating a fresh sync.
 RESUME_TRY=2
-## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be careful with this option if you have multiple masters.
+## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be carefull with this option if you have multiple masters.
 FORCE_STRANGER_LOCK_RESUME=no
 
-## Keep partial uploads that can be resumed on next run, experimental feature
-PARTIAL=no
-
 ## ---------- ALERT OPTIONS
 
 ## List of alert mails separated by spaces
 DESTINATION_MAILS="your@alert.tld"
 
-## Windows (MSYS environment) only mail options (used with sendemail.exe from Brandon Zehm)
-SENDER_MAIL="alert@your.system.tld"
-SMTP_SERVER=smtp.your.isp.tld
+## Windows (MSYS environment) only mail options (used by sendemail.exe)
+SENDER_MAIL="alert@your.system"
+SMTP_SERVER=smtp.your.isp.com
 SMTP_USER=
 SMTP_PASSWORD=
 

dev/tests/conf/remote.conf

@@ -1,43 +1,35 @@
 #!/usr/bin/env bash
 
-###### Osync - Rsync based two way sync engine with fault tolerance
-###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
-###### Config file rev 2611201401
+###### 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 2016102101
 
 ## ---------- GENERAL OPTIONS
 
 ## Sync job identification
-SYNC_ID="sync_test"
+INSTANCE_ID="remote"
 
-## Directories to synchronize. Master must be on the system Osync runs on. Slave can be either a local directory, or a remote one.
-MASTER_SYNC_DIR="master"
-SLAVE_SYNC_DIR="ssh://localhost//tmp/osync_tests/remote/slave"
-#SLAVE_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
-## If slave replica is a remote directory, you must specify a RSA key (please use full path). Please see documentation for further information.
-#SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
+## Directories to synchronize.
+## Initiator is the system osync runs on. The initiator directory must be a local path.
+INITIATOR_SYNC_DIR="${HOME}/osync-tests/initiator"
+
+## Target is the system osync synchronizes to (can be the same system as the initiator in case of local sync tasks). The target directory can be a local or remote path.
+#TARGET_SYNC_DIR="${HOME}/osync-tests/target"
+TARGET_SYNC_DIR="ssh://root@localhost:49999/${HOME}/osync-tests/target"
+
+## If the target system is remote, you can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
+SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
+
+## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed.
+SSH_PASSWORD_FILE=""
 
 ## Create sync directories if they do not exist
-CREATE_DIRS=yes
+CREATE_DIRS=no
 
 ## Log file location. Leaving this empty will create a logfile at /var/log/osync_version_SYNC_ID.log (or current directory if /var/log doesn't exist)
 LOGFILE=""
 
-
-## List of directories to exclude from sync on both sides (rsync patterns, wildcards work).
-## Paths are relative to sync dirs. List elements are separated by a semicolon.
-RSYNC_EXCLUDE_PATTERN=""
-#RSYNC_EXCLUDE_PATTERN="tmp;archives"
-
-## File that contains the list of directories or files to exclude from sync on both sides. Leave this empty if you don't want to use an exclusion file.
-## This file has to be in the same directory as the config file
-## Paths are relative to sync dirs. One element per line.
-RSYNC_EXCLUDE_FROM=""
-#RSYNC_EXCLUDE_FROM="exclude.list"
-
-## List elements separator char.  You may set an alternative separator char for your directories lists above.
-PATH_SEPARATOR_CHAR=";"
-
-## Generate an alert if master or slave replicas have less free space than given value in KB.
+## Generate an alert if initiator or target replicas have less free space than given value in KB. Set this to zero to skip disk space tests. 
 MINIMUM_SPACE=10240
 
 ## Bandwidth limit Kbytes / second. Leave 0 to disable limitation
@@ -47,46 +39,84 @@ BANDWIDTH=0
 SUDO_EXEC=no
 ## Paranoia option. Don't change this unless you read the documentation.
 RSYNC_EXECUTABLE=rsync
+## Remote rsync executable path. Leave this empty in most cases
+RSYNC_REMOTE_PATH=""
+
+## Rsync exclude / include order (the option set here will be set first, eg: include will make include then exclude patterns)
+RSYNC_PATTERN_FIRST=include
+
+## List of files / directories to incldue / exclude from sync on both sides (see rsync patterns, wildcards work).
+## Paths are relative to sync dirs. List elements are separated by a semicolon.
+RSYNC_INCLUDE_PATTERN=""
+RSYNC_EXCLUDE_PATTERN="*.php"
+#RSYNC_EXCLUDE_PATTERN="tmp;archives"
+
+## Files that contains lists of files / directories to include / exclude from sync on both sides. Leave this empty if you don't want to use an exclusion file.
+## This file has to be in the same directory as the config file
+## Paths are relative to sync dirs. One element per line.
+RSYNC_INCLUDE_FROM=""
+RSYNC_EXCLUDE_FROM=""
+#RSYNC_EXCLUDE_FROM="exclude.list"
+
+## List elements separator char.  You may set an alternative separator char for your directories lists above.
+PATH_SEPARATOR_CHAR=";"
 
 ## ---------- REMOTE SYNC OPTIONS
 
 ## ssh compression should be used unless your remote connection is good enough (LAN)
 SSH_COMPRESSION=yes
 
+## Ignore ssh known hosts. DANGER WILL ROBINSON DANGER ! This can lead to security issues. Only enable this if you know what you're doing.
+SSH_IGNORE_KNOWN_HOSTS=no
+
 ## Check for connectivity to remote host before launching remote sync task. Be sure the hosts responds to ping. Failing to ping will stop sync.
 REMOTE_HOST_PING=no
 
 ## Check for internet access by pinging one or more 3rd party hosts before remote sync task. Leave empty if you don't want this check to be be performed. Failing to ping will stop sync.
 ## If you use this function, you should set more than one 3rd party host, and be sure you can ping them.
 ## Be aware some DNS like opendns redirect false hostnames. Also, this adds an extra execution time of a bit less than a minute.
-REMOTE_3RD_PARTY_HOSTS=""
-
-## Remote rsync executable path. Leave this empty in most cases
-RSYNC_REMOTE_PATH=""
+REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com"
 
 ## ---------- MISC OPTIONS
 
+## Preserve basic linux permissions
+PRESERVE_PERMISSIONS=yes
+PRESERVE_OWNER=yes
+PRESERVE_GROUP=yes
+## On MACOS X, does not work and will be ignored
+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_ACL=yes
 ## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.
-PRESERVE_XATTR=no
+PRESERVE_XATTR=yes
 ## Transforms symlinks into referent files/dirs
 COPY_SYMLINKS=no
 ## Treat symlinked dirs	as dirs. CAUTION: This also follows symlinks outside of the replica root.
 KEEP_DIRLINKS=no
 ## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them.
 PRESERVE_HARDLINKS=no
+## Do a full checksum on all files that have identical sizes, they are checksummed to see if they actually are identical. This can take a long time.
+CHECKSUM=no
 
-## Let RSYNC compress file transfers. Do not use this if both master and slave replicas are on local system. Also,  do not use this if you already enabled SSH compression.
+## Let RSYNC compress file transfers. Do not use this if both initator and target replicas are on local system. Also,  do not use this if you already enabled SSH compression.
 RSYNC_COMPRESS=yes
 
-## Maximum execution time (in seconds) for sync process. Soft exec time only generates a warning. Hard exec time will generate a warning and stop sync process.
+## Maximum execution time (in seconds) for sync process. Set these values zero will disable max execution times.
+## Soft exec time only generates a warning. Hard exec time will generate a warning and stop sync process.
 SOFT_MAX_EXEC_TIME=7200
 HARD_MAX_EXEC_TIME=10600
 
+## Log a message every KEEP_LOGGING seconds just to know the task is still alive
+KEEP_LOGGING=1801
+
 ## Minimum time (in seconds) in file monitor /daemon mode between modification detection and sync task in order to let copy operations finish.
 MIN_WAIT=60
 
+## Maximum time (in seconds) waiting in file monitor / daemon mode. After this time, sync is run.
+## Use 0 to wait indefinitely.
+MAX_WAIT=7200
+
 ## ---------- BACKUP AND DELETION OPTIONS
 
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
@@ -96,39 +126,48 @@ CONFLICT_BACKUP_MULTIPLE=no
 ## Osync will clean backup files after a given number of days. Setting this to 0 will disable cleaning and keep backups forever. Warning: This can be very space consuming.
 CONFLICT_BACKUP_DAYS=30
 ## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica.
-CONFLICT_PREVALANCE=master
+CONFLICT_PREVALANCE=initiator
 
 ## On deletion propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted
 SOFT_DELETE=yes
 ## Osync will clean deleted files after a given number of days. Setting this to 0 will disable cleaning and keep deleted files forever. Warning: This can be very space consuming.
 SOFT_DELETE_DAYS=30
 
+## Optional deletion skip on replicas. Valid values are "initiator", "target", or "initiator,target"
+SKIP_DELETION=
+
 ## ---------- RESUME OPTIONS
 
 ## Try to resume an aborted sync task
 RESUME_SYNC=yes
 ## Number maximum resume tries before initiating a fresh sync.
 RESUME_TRY=2
-## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be careful with this option if you have multiple masters.
+## When a pidlock exists on slave replica that does not correspond to the initiator's instance-id, force pidlock removal. Be careful with this option if you have multiple initiators.
 FORCE_STRANGER_LOCK_RESUME=no
 
 ## Keep partial uploads that can be resumed on next run, experimental feature
 PARTIAL=no
 
+## Use delta copy algortithm (usefull when local paths are network drives), defaults to yes
+DELTA_COPIES=yes
+
 ## ---------- ALERT OPTIONS
 
 ## List of alert mails separated by spaces
-DESTINATION_MAILS="your@alert.tld"
+DESTINATION_MAILS=""
 
-## Windows (MSYS environment) only mail options (used with sendemail.exe from Brandon Zehm)
+## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/)
 SENDER_MAIL="alert@your.system.tld"
 SMTP_SERVER=smtp.your.isp.tld
+SMTP_PORT=25
+# encryption can be tls, ssl or none
+SMTP_ENCRYPTION=none
 SMTP_USER=
 SMTP_PASSWORD=
 
 ## ---------- EXECUTION HOOKS
 
-## Commands can will be run before and / or after sync process (remote execution will only happen if REMOTE_SYNC is set).
+## Commands can will be run before and / or after sync process (remote execution will only happen if REMOTE_OPERATION is set).
 LOCAL_RUN_BEFORE_CMD=""
 LOCAL_RUN_AFTER_CMD=""
 
@@ -139,5 +178,8 @@ REMOTE_RUN_AFTER_CMD=""
 MAX_EXEC_TIME_PER_CMD_BEFORE=0
 MAX_EXEC_TIME_PER_CMD_AFTER=0
 
-## Stops Osync execution if one of the above commands fail
+## Stops osync execution if one of the above commands fail
 STOP_ON_CMD_ERROR=yes
+
+## Run local and remote after sync commands even on failure
+RUN_AFTER_CMD_ON_ERROR=no

install.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 PROGRAM=osync
-PROGRAM_VERSION=1.1
+PROGRAM_VERSION=1.1.6-beta
 PROGRAM_BINARY=$PROGRAM".sh"
 PROGRAM_BATCH=$PROGRAM"-batch.sh"
-SCRIPT_BUILD=2016052601
+SCRIPT_BUILD=2016082902
 
 ## osync / obackup / pmocr / zsnap install script
 ## Tested on RHEL / CentOS 6 & 7, Fedora 23, Debian 7 & 8, Mint 17 and FreeBSD 8 & 10
@@ -12,12 +12,12 @@ SCRIPT_BUILD=2016052601
 
 #TODO: silent mode and no stats mode
 
-CONF_DIR=/etc/$PROGRAM
-BIN_DIR=/usr/local/bin
-SERVICE_DIR_INIT=/etc/init.d
+CONF_DIR=$FAKEROOT/etc/$PROGRAM
+BIN_DIR="$FAKEROOT/usr/local/bin"
+SERVICE_DIR_INIT=$FAKEROOT/etc/init.d
 # Should be /usr/lib/systemd/system, but /lib/systemd/system exists on debian & rhel / fedora
-SERVICE_DIR_SYSTEMD_SYSTEM=/lib/systemd/system
-SERVICE_DIR_SYSTEMD_USER=/etc/systemd/user
+SERVICE_DIR_SYSTEMD_SYSTEM=$FAKEROOT/lib/systemd/system
+SERVICE_DIR_SYSTEMD_USER=$FAKEROOT/etc/systemd/user
 
 ## osync specific code
 OSYNC_SERVICE_FILE_INIT="osync-srv"
@@ -31,8 +31,8 @@ PMOCR_SERVICE_FILE_SYSTEMD_SYSTEM="pmocr-srv.service"
 ## Generic code
 
 ## Default log file
-if [ -w /var/log ]; then
-        LOG_FILE="/var/log/$PROGRAM-install.log"
+if [ -w $FAKEROOT/var/log ]; then
+        LOG_FILE="$FAKEROOT/var/log/$PROGRAM-install.log"
 elif ([ "$HOME" != "" ] && [ -w "$HOME" ]); then
         LOG_FILE="$HOME/$PROGRAM-install.log"
 else
@@ -95,16 +95,16 @@ function SetOSSettings {
 		*"Darwin"*)
 		GROUP=admin
 		;;
-		*)
-		GROUP=root
-		;;
 		*"MINGW32"*|*"CYGWIN"*)
 		USER=""
 		GROUP=""
 		;;
+		*)
+		GROUP=root
+		;;
 	esac
 
-	if ([ "$USER" != "" ] && [ "$(whoami)" != "$USER" ]); then
+	if ([ "$USER" != "" ] && [ "$(whoami)" != "$USER" ] && [ "$FAKEROOT" == "" ]); then
 	  	QuickLogger "Must be run as $USER."
 		exit 1
 	fi
@@ -141,19 +141,19 @@ function CreateConfDir {
 
 function CopyExampleFiles {
 	if [ -f "./sync.conf.example" ]; then
-		cp "./sync.conf.example" "/etc/$PROGRAM/sync.conf.example"
+		cp "./sync.conf.example" "$FAKEROOT/etc/$PROGRAM/sync.conf.example"
 	fi
 
 	if [ -f "./host_backup.conf.example" ]; then
-		cp "./host_backup.conf.example" "/etc/$PROGRAM/host_backup.conf.example"
+		cp "./host_backup.conf.example" "$FAKEROOT/etc/$PROGRAM/host_backup.conf.example"
 	fi
 
 	if [ -f "./exlude.list.example" ]; then
-		cp "./exclude.list.example" "/etc/$PROGRAM"
+		cp "./exclude.list.example" "$FAKEROOT/etc/$PROGRAM"
 	fi
 
 	if [ -f "./snapshot.conf.example" ]; then
-		cp "./snapshot.conf.example" "/etc/$PROGRAM/snapshot.conf.example"
+		cp "./snapshot.conf.example" "$FAKEROOT/etc/$PROGRAM/snapshot.conf.example"
 	fi
 }
 
@@ -184,7 +184,7 @@ function CopyProgram {
 			QuickLogger "Cannot copy ssh_filter.sh to [$BIN_DIR]."
 		else
 			chmod 755 "$BIN_DIR/ssh_filter.sh"
-			if ([ "$USER" != "" ] && [ "$GROUP" != "" ]); then
+			if ([ "$USER" != "" ] && [ "$GROUP" != "" ] && [ "$FAKEROOT" == "" ]); then
 				chown $USER:$GROUP "$BIN_DIR/ssh_filter.sh"
 			fi
 			QuickLogger "Copied ssh_filter.sh to [$BIN_DIR]."
@@ -282,6 +282,10 @@ do
 	esac
 done
 
+if [ "$FAKEROOT" != "" ]; then
+	mkdir -p "$SERVICE_DIR_SYSTEMD_SYSTEM" "$SERVICE_DIR_SYSTEMD_USER" "$BIN_DIR"
+fi
+
 SetOSSettings
 CreateConfDir
 CopyExampleFiles

osync.sh

@@ -3,11 +3,11 @@
 PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
-PROGRAM_VERSION=1.1
-PROGRAM_BUILD=2016072701
+PROGRAM_VERSION=1.1.6-beta
+PROGRAM_BUILD=2016113001
 IS_STABLE=yes
 
-## FUNC_BUILD=2016071902
+## FUNC_BUILD=2016071902-i
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -24,6 +24,9 @@ KEEP_LOGGING=1801
 ## Correct output of sort command (language agnostic sorting)
 export LC_ALL=C
 
+## Default umask for file creation
+umask 0077
+
 # Standard alert mail body
 MAIL_ALERT_MSG="Execution of $PROGRAM instance $INSTANCE_ID on $(date) has warnings/errors."
 
@@ -43,14 +46,16 @@ WARN_ALERT=0
 ## allow debugging from command line with _DEBUG=yes
 if [ ! "$_DEBUG" == "yes" ]; then
 	_DEBUG=no
-	SLEEP_TIME=.1
 	_VERBOSE=0
 else
-	SLEEP_TIME=1
 	trap 'TrapError ${LINENO} $?' ERR
 	_VERBOSE=1
 fi
 
+if [ "$SLEEP_TIME" == "" ]; then
+	SLEEP_TIME=.1
+fi
+
 SCRIPT_PID=$$
 
 LOCAL_USER=$(whoami)
@@ -76,7 +81,7 @@ fi
 
 
 # Default alert attachment filename
-ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log"
+ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$$.last.log"
 
 # Set error exit code if a piped command fails
 	set -o pipefail
@@ -118,14 +123,20 @@ function Logger {
 	if [ "$level" == "CRITICAL" ]; then
 		_Logger "$prefix\e[41m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "ERROR" ]; then
 		_Logger "$prefix\e[91m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		ERROR_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.error.$SCRIPT_PID"
 		return
 	elif [ "$level" == "WARN" ]; then
 		_Logger "$prefix\e[93m$value\e[0m" "$prefix$level:$value" "$level:$value"
 		WARN_ALERT=1
+		# ERROR_ALERT / WARN_ALERT isn't set in main when Logger is called from a su$
+		echo "1" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.warn.$SCRIPT_PID"
 		return
 	elif [ "$level" == "NOTICE" ]; then
 		_Logger "$prefix$value"
@@ -166,19 +177,34 @@ function QuickLogger {
 
 # Portable child (and grandchild) kill function tester under Linux, BSD and MacOS X
 function KillChilds {
-	local pid="${1}"
-	local self="${2:-false}"
+        local pid="${1}" # Parent pid to kill childs
+        local self="${2:-false}" # Should parent be killed too ?
 
+        # Paranoid checks, we can safely assume that $pid shouldn't be 0 nor 1
+        if [ $(IsNumeric "$pid") -eq 0 ] || [ "$pid" == "" ] || [ "$pid" == "0" ] || [ "$pid" == "1" ]; then
+                Logger "Bogus pid given [$pid]." "CRITICAL"
+                return 1
+        fi
+
+        if kill -0 "$pid" > /dev/null 2>&1; then
+                # Warning: pgrep is not native on cygwin, have this checked in CheckEnvironment
                 if children="$(pgrep -P "$pid")"; then
+                        if [[ "$pid" == *"$children"* ]]; then
+                                Logger "Bogus pgrep implementation." "CRITICAL"
+                                children="${children/$pid/}"
+                        fi
                         for child in $children; do
                                 KillChilds "$child" true
                         done
                 fi
+        fi
 
         # Try to kill nicely, if not, wait 15 seconds to let Trap actions happen before killing
-	if ( [ "$self" == true ] && eval $PROCESS_TEST_CMD > /dev/null 2>&1); then
-		Logger "Sending SIGTERM to process [$pid]." "DEBUG"
-		kill -s SIGTERM "$pid"
+        if [ "$self" == true ]; then
+                # We need to check for pid again because it may have disappeared after recursive function call
+                if kill -0 "$pid" > /dev/null 2>&1; then
+                        kill -s TERM "$pid"
+                        Logger "Sent SIGTERM to process [$pid]." "DEBUG"
                         if [ $? != 0 ]; then
                                 sleep 15
                                 Logger "Sending SIGTERM to process [$pid] failed." "DEBUG"
@@ -186,9 +212,13 @@ function KillChilds {
                                 if [ $? != 0 ]; then
                                         Logger "Sending SIGKILL to process [$pid] failed." "DEBUG"
                                         return 1
-			fi
-		fi
+                                fi      # Simplify the return 0 logic here
+                        else
                                 return 0
+                        fi
+                else
+                        return 0
+                fi
         else
                 return 0
         fi
@@ -339,7 +369,7 @@ function SendAlert {
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
-		rm "$ALERT_LOG_FILE"
+		rm -f "$ALERT_LOG_FILE"
 	fi
 }
 
@@ -373,7 +403,7 @@ function SendEmail {
 	local auth_string=
 
 	if [ ! -f "$attachment" ]; then
-		attachment_command="-a $ALERT_LOG_FILE"
+		attachment_command="-a $attachment"
 		mail_no_attachment=1
 	else
 		mail_no_attachment=0
@@ -563,7 +593,7 @@ function StripQuotes {
 
 function EscapeSpaces {
 	local string="${1}" # String on which spaces will be escaped
-	echo "${string// /\ }"
+	echo "${string// /\\ }"
 }
 
 function IsNumeric {
@@ -748,10 +778,10 @@ function WaitForTaskCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -795,10 +825,16 @@ function WaitForCompletion {
 				KillChilds $pid
 				if [ $? == 0 ]; then
 					Logger "Task stopped successfully" "NOTICE"
-					return 0
 				else
-					return 1
+					Logger "Could not stop task" "ERROR"
 				fi
+				return 1
+				#if [ $? == 0 ]; then
+				#	Logger "Task stopped successfully" "NOTICE"
+				#	return 0
+				#else
+				#	return 1
+				#fi
 			fi
 		fi
 		sleep $SLEEP_TIME
@@ -943,7 +979,7 @@ function RsyncPatternsAdd {
 	local pattern_type="${1}"	# exclude or include
 	local pattern="${2}"
 
-	local rest=
+	local rest
 
 	# Disable globbing so wildcards from exclusions do not get expanded
 	set -f
@@ -972,8 +1008,6 @@ function RsyncPatternsFromAdd {
 	local pattern_type="${1}"
 	local pattern_from="${2}"
 
-	local pattern_from=
-
 	## Check if the exclude list has a full path, and if not, add the config file path if there is one
 	if [ "$(basename $pattern_from)" == "$pattern_from" ]; then
 		pattern_from="$(dirname $CONFIG_FILE)/$pattern_from"
@@ -987,20 +1021,29 @@ function RsyncPatternsFromAdd {
 function RsyncPatterns {
 
        if [ "$RSYNC_PATTERN_FIRST" == "exclude" ]; then
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "$RSYNC_INCLUDE_PATTERN" "include"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
-        elif [ "$RSYNC_PATTERN_FIRST" == "include" ]; then
+	# Use default include first for quicksync runs
+	elif [ "$RSYNC_PATTERN_FIRST" == "include" ] || [ "$_QUICK_SYNC" == "2" ]; then
+		if [ "$RSYNC_INCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "include" "$RSYNC_INCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_INCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "include" "$RSYNC_INCLUDE_FROM"
 		fi
+		if [ "$RSYNC_EXCLUDE_PATTERN" != "" ]; then
 			RsyncPatternsAdd "exclude" "$RSYNC_EXCLUDE_PATTERN"
+		fi
 		if [ "$RSYNC_EXCLUDE_FROM" != "" ]; then
 			RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
 		fi
@@ -1123,9 +1166,9 @@ function PreInit {
 function PostInit {
 
 	# Define remote commands
-        SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
-        SCP_CMD="$(type -p scp) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
-        RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
+	SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS $REMOTE_USER@$REMOTE_HOST -p $REMOTE_PORT"
+	SCP_CMD="$(type -p scp) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY -P $REMOTE_PORT"
+	RSYNC_SSH_CMD="$(type -p ssh) $SSH_COMP -q -i $SSH_RSA_PRIVATE_KEY $SSH_OPTS -p $REMOTE_PORT"
 }
 
 function InitLocalOSSettings {
@@ -1202,7 +1245,15 @@ function TrapStop {
 }
 
 function TrapQuit {
-	local exitcode=
+	local exitcode
+
+	# Get ERROR / WARN alert flags from subprocesses that call Logger
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.warn.$SCRIPT_PID" ]; then
+		WARN_ALERT=1
+	fi
+	if [ -f "$RUN_DIR/$PROGRAM.Logger.error.$SCRIPT_PID" ]; then
+		ERROR_ALERT=1
+	fi
 
 	if [ $ERROR_ALERT -ne 0 ]; then
 		UnlockReplicas
@@ -1234,9 +1285,7 @@ function TrapQuit {
 		exitcode=240	# Special exit code for daemon mode not stopping on warnings
 	else
 		UnlockReplicas
-		if [ "$RUN_AFTER_CMD_ON_ERROR" == "yes" ]; then
 		RunAfterHook
-		fi
 		CleanUp
 		Logger "$PROGRAM finished." "NOTICE"
 		exitcode=0
@@ -1541,7 +1590,7 @@ function _CheckLocksRemote {
 	Logger "cmd: $cmd" "DEBUG"
 	eval "$cmd" &
 	WaitForTaskCompletion $! 720 1800 ${FUNCNAME[0]}
-	if [ $? != 0 ]; then
+	if [ $? == 0 ]; then
 		if [ -f "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" ]; then
 			lockfile_content=$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)
 		else
@@ -1729,9 +1778,8 @@ function _get_file_ctime_mtime_local {
 	local replica_type="${2}" # Initiator / Target
 	local file_list="${3}" # Contains list of files to get time attrs
 
-	#cat "$file_list" | xargs -I {} stat -c '%n;%Z;%Y' "$replica_path{}" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
 	echo -n "" > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"
-	while read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort > "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
+	while read file; do $STAT_CTIME_MTIME_CMD "$replica_path$file" | sort >> "$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID"; done < "$file_list"
 }
 
 function _get_file_ctime_mtime_remote {
@@ -1739,7 +1787,8 @@ function _get_file_ctime_mtime_remote {
 	local replica_type="${2}"
 	local file_list="${3}"
 
-	local cmd=
+	local cmd
+
 	cmd='cat "'$file_list'" | '$SSH_CMD' "while read file; do '$REMOTE_STAT_CTIME_MTIME_CMD' \"'$replica_path'\$file\"; done | sort" > "'$RUN_DIR/$PROGRAM.ctime_mtime.$replica_type.$SCRIPT_PID'"'
 	Logger "CMD: $cmd" "DEBUG"
 	eval $cmd
@@ -1940,6 +1989,12 @@ function _delete_local {
 	do
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
 			if [ "$SOFT_DELETE" != "no" ]; then
+
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $replica_dir$files" "NOTICE"
+				fi
+
+				if [ $_DRYRUN -ne 1 ]; then
 					if [ ! -d "$replica_dir$deletion_dir" ]; then
 						mkdir -p "$replica_dir$deletion_dir"
 						if [ $? != 0 ]; then
@@ -1947,11 +2002,6 @@ function _delete_local {
 						fi
 					fi
 
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $replica_dir$files" "NOTICE"
-				fi
-
-				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$replica_dir$deletion_dir/$files" ]; then
 						rm -rf "${replica_dir:?}$deletion_dir/$files"
 					fi
@@ -2006,7 +2056,7 @@ function _delete_remote {
 
 	# Additionnaly, we need to copy the deletetion list to the remote state folder
 	esc_dest_dir="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$2\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" \"${INITIATOR[1]}${INITIATOR[3]}/$deleted_list_file\" $REMOTE_USER@$REMOTE_HOST:\"$esc_dest_dir/\" > $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.precopy.$SCRIPT_PID 2>&1"
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -2017,12 +2067,12 @@ function _delete_remote {
 		exit 1
 	fi
 
-$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "$TARGET_STATE_DIR/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
+$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" SOFT_DELETE=$SOFT_DELETE DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1 &
 
 	## The following lines are executed remotely
 	function _logger {
 		local value="${1}" # What to log
-		echo -e "$value" >> "$LOG_FILE"
+		echo -e "$value" >&2 # Log to STDERR
 
 		if [ $_SILENT -eq 0 ]; then
 		echo -e "$value"
@@ -2066,7 +2116,16 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 	IFS=$'\r\n'
 	for files in $(cat "$FILE_LIST")
 	do
+		Logger "Processing file [$file]." "DEBUG"
 		if [[ "$files" != "$previous_file/"* ]] && [ "$files" != "" ]; then
+
+			if [ "$SOFT_DELETE" != "no" ]; then
+				if [ $_VERBOSE -eq 1 ]; then
+					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
+				fi
+
+				Logger "Full path for deletion is [$REPLICA_DIR$DELETE_DIR/$files]." "DEBUG"
+
 				if [ ! -d "$REPLICA_DIR$DELETE_DIR" ]; then
 					$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR"
 					if [ $? != 0 ]; then
@@ -2074,24 +2133,19 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 					fi
 				fi
 
-			if [ "$SOFT_DELETE" != "no" ]; then
-				if [ $_VERBOSE -eq 1 ]; then
-					Logger "Soft deleting $REPLICA_DIR$files" "NOTICE"
-				fi
-
 				if [ $_DRYRUN -ne 1 ]; then
 					if [ -e "$REPLICA_DIR$DELETE_DIR/$files" ]; then
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$DELETE_DIR/$files"
 					fi
 
-					if [ -e "$$REPLICA_DIR$files" ]; then
+					if [ -e "$REPLICA_DIR$files" ]; then
 						# In order to keep full path on soft deletion, create parent directories before move
 						parentdir="$(dirname "$files")"
 						if [ "$parentdir" != "." ]; then
 							$COMMAND_SUDO mkdir -p "$REPLICA_DIR$DELETE_DIR/$parentdir"
 							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR/$parentdir"
 						else
-							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"1
+							$COMMAND_SUDO mv -f "$REPLICA_DIR$files" "$REPLICA_DIR$DELETE_DIR"
 						fi
 						if [ $? != 0 ]; then
 							Logger "Cannot move $REPLICA_DIR$files to deletion directory." "ERROR"
@@ -2109,7 +2163,7 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 						$COMMAND_SUDO rm -rf "$REPLICA_DIR$files"
 						if [ $? != 0 ]; then
 							Logger "Cannot delete $REPLICA_DIR$files" "ERROR"
-							echo "$files" >> "$TARGET_STATE_DIR/$FAILED_DELETE_LIST"
+							echo "$files" >> "$FAILED_DELETE_LIST"
 						fi
 					fi
 				fi
@@ -2125,7 +2179,7 @@ ENDSSH
 
 	## Copy back the deleted failed file list
 	esc_source_file="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")"
-	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" $SYNC_OPTS -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
+	rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -e \"$RSYNC_SSH_CMD\" $REMOTE_USER@$REMOTE_HOST:\"$esc_source_file\" \"${INITIATOR[1]}${INITIATOR[3]}\" > \"$RUN_DIR/$PROGRAM.remote_failed_deletion_list_copy.$SCRIPT_PID\""
 	Logger "RSYNC_CMD: $rsync_cmd" "DEBUG"
 	eval "$rsync_cmd" 2>> "$LOG_FILE"
 	if [ $? != 0 ]; then
@@ -2203,8 +2257,6 @@ function Sync {
 	local resume_sync=
 
 	Logger "Starting synchronization task." "NOTICE"
-	CheckConnectivity3rdPartyHosts
-	CheckConnectivityRemoteHost
 
 	if [ -f "${INITIATOR[7]}" ] && [ "$RESUME_SYNC" != "no" ]; then
 		resume_sync=$(cat "${INITIATOR[7]}")
@@ -2383,13 +2435,13 @@ function _SoftDeleteLocal {
 		fi
 			if [ $_VERBOSE -eq 1 ]; then
 			# Cannot launch log function from xargs, ugly hack
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete file {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
-			$FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} echo "Will delete directory {}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID"
 			Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 		fi
 			if [ $_DRYRUN -ne 1 ]; then
-			$FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} rm -f "{}" && $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
+			$COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type f -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -f "{}" && $COMMAND_SUDO $FIND_CMD "$replica_deletion_path/" -type d -empty -ctime +$change_time -print0 | xargs -0 -I {} $COMMAND_SUDO rm -rf "{}" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 &
 		else
 			Dummy &
 		fi
@@ -2417,14 +2469,14 @@ function _SoftDeleteRemote {
 	CheckConnectivityRemoteHost
 
 	if [ $_DRYRUN -eq 1 ]; then
-		Logger "Listing files older than $change_time days on target replica. Does not remove anything." "NOTICE"
+		Logger "Listing files older than $change_time days on $replica_type replica. Does not remove anything." "NOTICE"
 	else
-		Logger "Removing files older than $change_time days on target replica." "NOTICE"
+		Logger "Removing files older than $change_time days on $replica_type replica." "NOTICE"
 	fi
 
 	if [ $_VERBOSE -eq 1 ]; then
 		# Cannot launch log function from xargs, ugly hack
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; exit 1; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} echo Will delete file {} && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} echo Will delete directory {}; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
 		WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
@@ -2432,7 +2484,7 @@ function _SoftDeleteRemote {
 	fi
 
 	if [ $_DRYRUN -ne 1 ]; then
-		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} rm -f \"{}\" && '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
+		cmd=$SSH_CMD' "if [ -d \"'$replica_deletion_path'\" ]; then '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type f -ctime +'$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -f \"{}\" && '$COMMAND_SUDO' '$REMOTE_FIND_CMD' \"'$replica_deletion_path'/\" -type d -empty -ctime '$change_time' -print0 | xargs -0 -I {} '$COMMAND_SUDO' rm -rf \"{}\"; else echo \"No remote backup/deletion directory.\"; fi" > "'$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID'" 2>&1'
 
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
@@ -2442,10 +2494,10 @@ function _SoftDeleteRemote {
 	WaitForCompletion $! $SOFT_MAX_EXEC_TIME $HARD_MAX_EXEC_TIME ${FUNCNAME[0]}
 	retval=$?
 	if [ $retval -ne 0 ]; then
-		Logger "Error while executing cleanup on remote target replica." "ERROR"
+		Logger "Error while executing cleanup on remote $replica_type replica." "ERROR"
 		Logger "Command output:\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "NOTICE"
 	else
-		Logger "Cleanup complete on target replica." "NOTICE"
+		Logger "Cleanup complete on $replica_type replica." "NOTICE"
 	fi
 }
 
@@ -2602,14 +2654,12 @@ function Init {
 	fi
 
 	## Add Rsync include / exclude patterns
-	if [ $_QUICK_SYNC -lt 2 ]; then
 	RsyncPatterns
-	fi
 
 	## Conflict options
 	if [ "$CONFLICT_BACKUP" != "no" ]; then
-		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[1]}${INITIATOR[4]}\""
-		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[1]}${TARGET[4]}\""
+		INITIATOR_BACKUP="--backup --backup-dir=\"${INITIATOR[4]}\""
+		TARGET_BACKUP="--backup --backup-dir=\"${TARGET[4]}\""
 		if [ "$CONFLICT_BACKUP_MULTIPLE" == "yes" ]; then
 			INITIATOR_BACKUP="$INITIATOR_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
 			TARGET_BACKUP="$TARGET_BACKUP --suffix .$(date +%Y.%m.%d-%H.%M.%S)"
@@ -2782,7 +2832,6 @@ do
 		;;
 		--initiator=*)
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
-		no_maxtime=1
 		INITIATOR_SYNC_DIR=${i##*=}
 		opts=$opts" --initiator=\"$INITIATOR_SYNC_DIR\""
 		;;
@@ -2790,7 +2839,6 @@ do
 		_QUICK_SYNC=$(($_QUICK_SYNC + 1))
 		TARGET_SYNC_DIR=${i##*=}
 		opts=$opts" --target=\"$TARGET_SYNC_DIR\""
-		no_maxtime=1
 		;;
 		--rsakey=*)
 		SSH_RSA_PRIVATE_KEY=${i##*=}
@@ -2853,6 +2901,10 @@ opts="${opts# *}"
 			HARD_MAX_EXEC_TIME=0
 		fi
 
+		if [ "$PATH_SEPARATOR_CHAR" == "" ]; then
+			PATH_SEPARATOR_CHAR=";"
+		fi
+
 		MIN_WAIT=30
 		REMOTE_OPERATION=no
 	else
@@ -2909,5 +2961,4 @@ opts="${opts# *}"
 		if [ $? == 0 ]; then
 			SoftDelete
 		fi
-		RunAfterHook
 	fi

packaging/ARCH/mksrcinfo

@@ -0,0 +1,279 @@
+#!/bin/bash
+
+shopt -s extglob
+
+array_build() {
+  local dest=$1 src=$2 i keys values
+
+  # it's an error to try to copy a value which doesn't exist.
+  declare -p "$2" &>/dev/null || return 1
+
+  # Build an array of the indicies of the source array.
+  eval "keys=(\"\${!$2[@]}\")"
+
+  # Clear the destination array
+  eval "$dest=()"
+
+  # Read values indirectly via their index. This approach gives us support
+  # for associative arrays, sparse arrays, and empty strings as elements.
+  for i in "${keys[@]}"; do
+    values+=("printf -v '$dest[$i]' %s \"\${$src[$i]}\";")
+  done
+
+  eval "${values[*]}"
+}
+
+funcgrep() {
+  { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2"
+}
+
+# extract_global_var function compatible with bash 4.2
+extract_global_var() {
+	# $1: variable name
+	# $2: multivalued
+	# $3: name of output var
+
+	local attr=$1 isarray=$2 outputvar=$3 ref
+
+	if (( isarray )); then
+		array_build ref "$attr"
+		[[ ${ref[@]} ]] && array_build "$outputvar" "$attr"
+	else
+		[[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}"
+	fi
+}
+
+# extract global_var function compatible with bash 4.3+
+old_extract_global_var() {
+  # $1: variable name
+  # $2: multivalued
+  # $3: name of output var
+
+  local attr=$1 isarray=$2 outputvar=$3
+
+  if (( isarray )); then
+    declare -n ref=$attr
+    # Still need to use array_build here because we can't handle the scoping
+    # semantics that would be included with the use of 'declare -n'.
+    [[ ${ref[@]} ]] && array_build "$outputvar" "$attr"
+  else
+    [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}"
+  fi
+}
+
+extract_function_var() {
+  # $1: function name
+  # $2: variable name
+  # $3: multivalued
+  # $4: name of output var
+
+  local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1
+
+  if (( isarray )); then
+    printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2"
+  else
+    printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2"
+  fi
+
+  while read -r; do
+    # strip leading whitespace and any usage of declare
+    decl=${REPLY##*([[:space:]])}
+    eval "${decl/#$attr/$outputvar}"
+
+    # entering this loop at all means we found a match, so notify the caller.
+    r=0
+  done < <(funcgrep "$funcname" "$attr_regex")
+
+  return $r
+}
+
+pkgbuild_get_attribute() {
+  # $1: package name
+  # $2: attribute name
+  # $3: multivalued
+  # $4: name of output var
+
+  local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4
+
+  printf -v "$outputvar" %s ''
+
+  if [[ $pkgname ]]; then
+    extract_global_var "$attrname" "$isarray" "$outputvar"
+    extract_function_var "package_$pkgname" "$attrname" "$isarray" "$outputvar"
+  else
+    extract_global_var "$attrname" "$isarray" "$outputvar"
+  fi
+}
+
+srcinfo_open_section() {
+  printf '%s = %s\n' "$1" "$2"
+}
+
+srcinfo_close_section() {
+  echo
+}
+
+srcinfo_write_attr() {
+  # $1: attr name
+  # $2: attr values
+
+  local attrname=$1 attrvalues=("${@:2}")
+
+  # normalize whitespace, strip leading and trailing
+  attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
+  attrvalues=("${attrvalues[@]#[[:space:]]}")
+  attrvalues=("${attrvalues[@]%[[:space:]]}")
+
+  printf "\t$attrname = %s\n" "${attrvalues[@]}"
+}
+
+pkgbuild_extract_to_srcinfo() {
+  # $1: pkgname
+  # $2: attr name
+  # $3: multivalued
+
+  local pkgname=$1 attrname=$2 isarray=$3 outvalue=
+
+  if pkgbuild_get_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then
+    srcinfo_write_attr "$attrname" "${outvalue[@]}"
+  fi
+}
+
+srcinfo_write_section_details() {
+  local attr package_arch a
+  local multivalued_arch_attrs=(source provides conflicts depends replaces
+                                optdepends makedepends checkdepends
+                                {md5,sha{1,224,256,384,512}}sums)
+
+  for attr in "${singlevalued[@]}"; do
+    pkgbuild_extract_to_srcinfo "$1" "$attr" 0
+  done
+
+  for attr in "${multivalued[@]}"; do
+    pkgbuild_extract_to_srcinfo "$1" "$attr" 1
+  done
+
+  pkgbuild_get_attribute "$1" 'arch' 1 'package_arch'
+  for a in "${package_arch[@]}"; do
+    # 'any' is special. there's no support for, e.g. depends_any.
+    [[ $a = any ]] && continue
+
+    for attr in "${multivalued_arch_attrs[@]}"; do
+      pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1
+    done
+  done
+}
+
+srcinfo_write_global() {
+  local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog)
+  local multivalued=(arch groups license checkdepends makedepends
+                     depends optdepends provides conflicts replaces
+                     noextract options backup
+                     source {md5,sha{1,224,256,384,512}}sums)
+
+  srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}"
+  srcinfo_write_section_details ''
+  srcinfo_close_section
+}
+
+srcinfo_write_package() {
+  local singlevalued=(pkgdesc url install changelog)
+  local multivalued=(arch groups license checkdepends depends optdepends
+                     provides conflicts replaces options backup)
+
+  srcinfo_open_section 'pkgname' "$1"
+  srcinfo_write_section_details "$1"
+  srcinfo_close_section
+}
+
+srcinfo_write() {
+  local pkg
+
+  srcinfo_write_global
+
+  for pkg in "${pkgname[@]}"; do
+    srcinfo_write_package "$pkg"
+  done
+}
+
+clear_environment() {
+  local environ
+
+  mapfile -t environ < <(compgen -A variable |
+      grep -xvF "$(printf '%s\n' "$@")")
+
+  # expect that some variables marked read only will complain here
+  unset -v "${environ[@]}" 2>/dev/null
+}
+
+srcinfo_write_from_pkgbuild() {(
+  clear_environment PATH
+
+  shopt -u extglob
+  . "$1" || exit 1
+  shopt -s extglob
+  srcinfo_write
+)}
+
+
+usage() {
+  printf '%s\n' \
+      'mksrcinfo v8' \
+      '' \
+      'mksrcinfo reads the target PKGBUILD and writes an equivalent .SRCINFO.' \
+      'Without passing any arguments, mksrcinfo will read from $PWD/PKGBUILD' \
+      'and write to $PWD/.SRCINFO.' \
+      '' \
+      'Usage: mksrcinfo [/path/to/pkgbuild]' \
+      '    -h                display this help message and exit' \
+      '    -o <file>         write output to <file>'
+}
+
+error() {
+  printf "==> ERROR: $1\n" "${@:2}" >&2
+}
+
+die() {
+  error "$@"
+  exit 1
+}
+
+write_srcinfo_header() {
+  local timefmt='%a %b %e %H:%M:%S %Z %Y'
+
+  # fiddle with the environment to ensure we get the a consistent language and
+  # timezone.
+  TZ=UTC LC_TIME=C \
+    printf "# Generated by mksrcinfo %s\n# %($timefmt)T\n" 'v8' -1
+}
+
+srcinfo_dest=$PWD/.SRCINFO
+
+while getopts ':o:h' flag; do
+  case $flag in
+    o)
+      srcinfo_dest=$OPTARG
+      ;;
+    :)
+      die "option '-%s' requires an argument" "$OPTARG"
+      ;;
+    h)
+      usage
+      exit 0
+      ;;
+    \?)
+      die "invalid option -- '-%s' (use -h for help)" "$OPTARG"
+      ;;
+  esac
+done
+shift $(( OPTIND - 1 ))
+
+[[ -f PKGBUILD ]] || die 'PKGBUILD not found in current directory'
+
+# TODO: replace this with 'makepkg --printsrcinfo' once makepkg>=4.3 is released.
+{
+  write_srcinfo_header
+  srcinfo_write_from_pkgbuild "${1:-$PWD/PKGBUILD}"
+} >"$srcinfo_dest"
+
+# vim: set et ts=2 sw=2:

packaging/ARCH/update-osync-pkg.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+git clone git+ssh://aur@aur.archlinux.org/osync.git osync.aur &&
+cd "osync.aur" &&
+srcdir="." &&
+source "PKGBUILD" &&
+
+url=$(echo -n ${source[0]} | sed 's/git+//g' | sed 's/#.*//g') &&
+branch=$(echo -n ${source[0]} | sed 's/.*#branch=//g') &&
+git clone -b $branch $url &&
+
+# Get pkgver from current osync
+pkgver=$(grep PROGRAM_VERSION= ./osync/osync.sh)
+pkgver=${pkgver##*=}
+echo $pkgver
+
+sed -i "s/pkgver=.*/pkgver=$(pkgver)/g" "PKGBUILD" &&
+../mksrcinfo &&
+rm -rf "osync" &&
+git add . &&
+git commit -m "Updated version" &&
+git push origin master &&
+cd .. &&
+rm -rf "osync.aur" &&
+echo "Package updated successfully"

tests/run.sh

@@ -1,345 +0,0 @@
-#!/usr/bin/env bash
-
-# Test dir
-TMP="/tmp/osync_tests"
-# SSH port used for remote tests
-SSH_PORT=49999
-
-# Get dir the tests are stored in
-TEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-cd "$TEST_DIR"
-
-OSYNC_EXECUTABLE="$(dirname $TEST_DIR)//osync.sh"
-declare -A sandbox_osync
-#sandbox_osync[quickLocal]="--master=master --slave=slave"
-#sandbox_osync[quickRemote]="--master=master --slave=ssh://localhost//tmp/osync_tests/quickRemote/slave"
-#sandbox_osync[local]="conf/local.conf"
-#sandbox_osync[remote]="conf/remote.conf"
-
-oneTimeSetUp()
-{
-    for i in "${!sandbox_osync[@]}"
-    do
-        prepareSandbox "$i"
-    done
-}
-
-oneTimeTearDown()
-{
-    rm -rf "$TMP"
-}
-
-prepareSandbox()
-{
-    rm -rf "$TMP/$1"
-    mkdir -p "$TMP/$1"
-    pushd "$TMP/$1" >/dev/null
-    mkdir master
-    mkdir slave
-    mkdir expected
-    popd >/dev/null
-}
-
-compareSandbox()
-{
-    diff -aurx .osync_workdir master slave
-    assertEquals 0 $?
-
-    diff -aurx .osync_workdir master expected
-    assertEquals 0 $?
-
-    diff -aurx .osync_workdir slave expected
-    assertEquals 0 $?
-}
-
-syncSandbox()
-{
-    $OSYNC_EXECUTABLE ${sandbox_osync[$1]} >/dev/null
-    assertEquals 0 $?
-}
-
-runSandbox()
-{
-    syncSandbox "$1"
-    compareSandbox
-}
-
-joinSandbox()
-{
-    cd "$TMP/$1"
-}
-
-### Tests ###
-# One empty file
-_testOneEmptyFile()
-{
-    joinSandbox "$1"
-
-    # Add one empty file
-    touch "$2/testOneEmpty"
-    touch expected/testOneEmpty
-    runSandbox "$1"
-
-    # Change one empty file
-    echo "Test" > "$2/testOneEmpty"
-    cp "$2/testOneEmpty" expected/testOneEmpty
-    runSandbox "$1"
-
-    # Empty one file
-    echo -n "" > "$2/testOneEmpty"
-    cp "$2/testOneEmpty" expected/testOneEmpty
-    runSandbox "$1"
-
-    # Delete one empty file
-    cp "$2/testOneEmpty" testOneEmpty
-    rm "$2/testOneEmpty"
-    rm expected/testOneEmpty
-    runSandbox "$1"
-    # Backup check
-    if [ "$2" == "master" ]
-    then
-        diff -aur slave/.osync_workdir/deleted/testOneEmpty testOneEmpty
-    else
-        diff -aur master/.osync_workdir/deleted/testOneEmpty testOneEmpty
-    fi
-    assertEquals 0 $?
-}
-
-testQuickLocalMasterOneEmptyFile()
-{
-    _testOneEmptyFile quickLocal master
-}
-
-testQuickLocalSlaveOneEmptyFile()
-{
-    _testOneEmptyFile quickLocal slave
-}
-
-testQuickRemoteMasterOneEmptyFile()
-{
-    _testOneEmptyFile quickRemote master
-}
-
-testQuickRemoteSlaveOneEmptyFile()
-{
-    _testOneEmptyFile quickRemote slave
-}
-
-testLocalMasterOneEmptyFile()
-{
-    _testOneEmptyFile local master
-}
-
-testLocalSlaveOneEmptyFile()
-{
-    _testOneEmptyFile local slave
-}
-
-testRemoteMasterOneEmptyFile()
-{
-    _testOneEmptyFile remote master
-}
-
-testRemoteSlaveOneEmptyFile()
-{
-    _testOneEmptyFile remote slave
-}
-
-# One file
-_testOneFile()
-{
-    joinSandbox "$1"
-
-    # Add one file
-    echo "Test" > "$2/testOne"
-    cp "$2/testOne" expected/testOne
-    runSandbox "$1"
-
-    # Change one file
-    echo "Test2" > "$2/testOne"
-    cp "$2/testOne" expected/testOne
-    runSandbox "$1"
-
-    # Delete one file
-    cp "$2/testOne" testOne
-    rm "$2/testOne"
-    rm expected/testOne
-    runSandbox "$1"
-    # Backup check
-    if [ "$2" == "master" ]
-    then
-        diff -aur slave/.osync_workdir/deleted/testOne testOne
-    else
-        diff -aur master/.osync_workdir/deleted/testOne testOne
-    fi
-    assertEquals 0 $?
-}
-
-testQuickLocalMasterOneFile()
-{
-    _testOneFile quickLocal master
-}
-
-testQuickLocalSlaveOneFile()
-{
-    _testOneFile quickLocal slave
-}
-
-testQuickRemoteMasterOneFile()
-{
-    _testOneFile quickRemote master
-}
-
-testQuickRemoteSlaveOneFile()
-{
-    _testOneFile quickRemote slave
-}
-
-testLocalMasterOneFile()
-{
-    _testOneFile local master
-}
-
-testLocalSlaveOneFile()
-{
-    _testOneFile local slave
-}
-
-testRemoteMasterOneFile()
-{
-    _testOneFile remote master
-}
-
-testRemoteSlaveOneFile()
-{
-    _testOneFile remote slave
-}
-
-# Distinct
-_testDistinct()
-{
-    joinSandbox "$1"
-
-    # Generate files in master
-    for i in testDistinctM1 testDistinctM2 testDistinctM3
-    do
-        mkdir "master/$i"
-        mkdir "expected/$i"
-        for j in m1 m2 m3 ; do
-            echo "$i/$j" > "master/$i/$j"
-            cp "master/$i/$j" "expected/$i/$j"
-        done
-    done
-
-    # Generate files in slave
-    for i in testDistinctS1 testDistinctS2 testDistinctS3
-    do
-        mkdir "slave/$i"
-        mkdir "expected/$i"
-        for j in s1 s2 s3 ; do
-            echo "$i/$j" > "slave/$i/$j"
-            cp "slave/$i/$j" "expected/$i/$j"
-        done
-    done
-
-    # Generate files in same directories for master and slave
-    for i in testDistinctMS1 testDistinctMS2 testDistinctMS3
-    do
-        mkdir "master/$i"
-        mkdir "slave/$i"
-        mkdir "expected/$i"
-        for j in ms1 ms2 ms3 ; do
-            echo "$i/$j" > "master/$i/m-$j"
-            cp "master/$i/m-$j" "expected/$i/m-$j"
-            echo "$i/$j" > "slave/$i/s-$j"
-            cp "slave/$i/s-$j" "expected/$i/s-$j"
-        done
-    done
-
-    runSandbox "$1"
-}
-
-testQuickLocalDistinct()
-{
-    _testDistinct quickLocal
-}
-
-testQuickRemoteDistinct()
-{
-    _testDistinct quickRemote
-}
-
-testLocalDistinct()
-{
-    _testDistinct local
-}
-
-testRemoteDistinct()
-{
-    _testDistinct remote
-}
-
-# Collision
-_testCollision()
-{
-    joinSandbox "$1"
-
-    # Slave precedence
-    echo "Test1" > master/testCollision1
-    echo "Test2" > slave/testCollision1
-    touch -d "2004-02-29 16:21:41" master/testCollision1
-    touch -d "2004-02-29 16:21:42" slave/testCollision1
-    cp slave/testCollision1 expected/testCollision1
-    cp master/testCollision1 testCollision1
-    runSandbox "$1"
-    # Backup check
-    diff -aur master/.osync_workdir/backups/testCollision1 testCollision1
-    assertEquals 0 $?
-
-    # Master precedence
-    echo "Test1" > master/testCollision2
-    echo "Test2" > slave/testCollision2
-    touch -d "2004-02-29 16:21:42" master/testCollision2
-    touch -d "2004-02-29 16:21:41" slave/testCollision2
-    cp master/testCollision2 expected/testCollision2
-    cp slave/testCollision2 testCollision2
-    runSandbox "$1"
-    # Backup check
-    diff -aur slave/.osync_workdir/backups/testCollision2 testCollision2
-    assertEquals 0 $?
-
-    # ??
-#    echo "Test1" > master/testCollision3
-#    echo "Test2" > slave/testCollision3
-#    touch -d "2004-02-29 16:21:42" master/testCollision3
-#    touch -d "2004-02-29 16:21:42" slave/testCollision3
-#    cp slave/testCollision3 expected/testCollision3
-#    runSandbox "$1"
-}
-
-testQuickLocalCollision()
-{
-    _testCollision quickLocal
-}
-
-testQuickRemoteCollision()
-{
-    _testCollision quickRemote
-}
-
-testLocalCollision()
-{
-    _testCollision local
-}
-
-testRemoteCollision()
-{
-    _testCollision remote
-}
-
-#suite()
-#{
-#    suite_addTest "testQuickRemoteMasterOneEmptyFile"
-#}
-
-. shunit2/shunit2