Merge branch 'master' of https://github.com/jodysankey/osync into jodysankey-master

Conflicts:
	sync.conf

CHANGELOG.md

@@ -9,7 +9,8 @@ RECENT CHANGES
 - Added (much) more verbose debugging (and possibility to remove debug code to gain speed)
 - Force tree function to overwrite earlier tree files
 ! Add Logger DEBUG to all eval statements
-- Replace child_pid by $? directly, add a better sub process killer in TrapQuit
+! Unlocking should only happen after TrapQuit has successfully killed any child processes
+!- Replace child_pid by $? directly, add a better sub process killer in TrapQuit
 - Refactor [local master, local slave, remote slave] code to [local, remote][initiator, target]code
 - Added some automatic typo checks in code, for _DEBUG mode (and _PARANOIA_DEBUG now)
 - Improved Logging

osync.sh

@@ -1571,7 +1571,7 @@ function Sync {
 				resume_sync=none
 			fi
 		else
-			Logger "Will not resume aborted osync execution. Too much resume tries [$resume_count]." "WARN"
+			Logger "Will not resume aborted osync execution. Too many resume tries [$resume_count]." "WARN"
 			echo "noresume" > "$INITIATOR_LAST_ACTION"
 			echo "0" > "$INITIATOR_RESUME_COUNT"
 			resume_sync=none
@@ -2117,7 +2117,7 @@ function Usage {
 	echo "--rsakey=\"\"	Alternative path to rsa private key for ssh connection to target replica"
 	echo "--sync-id=\"\"	Optional sync task name to identify this synchronization task when using multiple targets"
 	echo ""
-	echo "Additionnaly, you may set most osync options at runtime. eg:"
+	echo "Additionaly, you may set most osync options at runtime. eg:"
 	echo "SOFT_DELETE_DAYS=365 osync.sh --initiator=/path --target=/other/path"
 	echo ""
 	exit 128

tests/run.sh

@@ -1,17 +1,20 @@
 #!/bin/bash
 
-TEST_BUILD=2015070201
-
-cd -P -- "$(dirname -- "$0")"
-OSYNC_EXECUTABLE=$(readlink -e ../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]=$(readlink -e "conf/local.conf")
-sandbox_osync[remote]=$(readlink -e "conf/remote.conf")
-
-# Tmp dir
+# 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()
 {