From 776c07386db6539f71b2a7fab27cef126e4cef25 Mon Sep 17 00:00:00 2001
From: Orsiris de Jong <ozy@netpower.fr>
Date: Wed, 14 Jun 2023 13:49:18 +0200
Subject: [PATCH] Fix tests

---
 dev/ofunctions.sh      | 12 ++++++++++--
 dev/tests/run_tests.sh |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 dev/ofunctions.sh

diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
old mode 100644
new mode 100755
index 7d399bf..4f1f958
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -31,8 +31,8 @@
 #### OFUNCTIONS FULL SUBSET ####
 #### OFUNCTIONS MINI SUBSET ####
 #### OFUNCTIONS MICRO SUBSET ####
-_OFUNCTIONS_VERSION=2.5.0
-_OFUNCTIONS_BUILD=2023061001
+_OFUNCTIONS_VERSION=2.5.1
+_OFUNCTIONS_BUILD=2023061401
 #### _OFUNCTIONS_BOOTSTRAP SUBSET ####
 _OFUNCTIONS_BOOTSTRAP=true
 #### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
@@ -2275,6 +2275,13 @@ function InitRemoteOSDependingSettings {
 
 	## Set rsync default arguments (complete with -r or -d depending on recursivity later)
 	RSYNC_DEFAULT_ARGS="-ltD -8"
+
+	## NPF-MOD: Regarding #242, we need to add --old-args if rsync > 3.2.3
+	rsync_version=$("${RSYNC_EXECUTABLE}" --version 2>/dev/null| head -1 | awk '{print $3}')
+	if [ $(Vercomp $rsync_version 3.2.3) -eq 1 ]; then
+		RSYNC_DEFAULT_ARGS="$RSYNC_DEFAULT_ARGS --old-args"
+	fi
+
 	if [ "$_DRYRUN" == true ]; then
 		RSYNC_DRY_ARG="-n"
 		DRY_WARNING="/!\ DRY RUN "
@@ -2282,6 +2289,7 @@ function InitRemoteOSDependingSettings {
 		RSYNC_DRY_ARG=""
 	fi
 
+
 	RSYNC_ATTR_ARGS=""
 	if [ "$PRESERVE_PERMISSIONS" != false ]; then
 		RSYNC_ATTR_ARGS=$RSYNC_ATTR_ARGS" -p"
diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh
index 6a21830..e5d8b03 100755
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@@ -209,7 +209,7 @@ function oneTimeSetUp () {
 	echo "Show content of osync dir"
 	ls -alh ${OSYNC_DIR}
 	echo "Running install.sh from ${OSYNC_DIR}"
-	$SUDO_CMD ${OSYNC_DIR}/install.sh --prefix="${FAKEROOT}"
+	$SUDO_CMD ${OSYNC_DIR}/install.sh --no-stats --prefix="${FAKEROOT}"
 	source "$DEV_DIR/ofunctions.sh"
 
 	# Fix default umask because of ACL test that expects 0022 when creating test files