From c089ccc63b5bc78d238f46c3ec09c6809d8d5187 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 20 May 2019 23:31:26 +0200 Subject: [PATCH] Rebuilt targets --- dev/debug_osync.sh | 7 +++++-- osync.sh | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index fdb4a77..d3a8199 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2019 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-beta2 -PROGRAM_BUILD=2019052015 +PROGRAM_BUILD=2019052016 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -2574,7 +2574,7 @@ function CheckCurrentConfigAll { tmp="$SKIP_DELETION" IFS=',' read -r -a SKIP_DELETION <<< "$tmp" if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ] && [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ]; then - Logger "Bogus skip deletion parameter [$SKIP_DELETION]." "CRITICAL" + Logger "Bogus skip deletion parameter [${SKIP_DELETION[@]}]." "CRITICAL" exit 1 fi fi @@ -6508,6 +6508,9 @@ else exit 1 fi +# Reload GetCommandLineArguments so we can override config file with run time arguments +GetCommandlineArguments "${@}" + if [ "$LOGFILE" == "" ]; then if [ -w /var/log ]; then LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" diff --git a/osync.sh b/osync.sh index ca47008..1bdfa74 100755 --- a/osync.sh +++ b/osync.sh @@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2019 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.3.0-beta2 -PROGRAM_BUILD=2019052015 +PROGRAM_BUILD=2019052016 IS_STABLE=false CONFIG_FILE_REVISION_REQUIRED=1.3.0 @@ -2422,7 +2422,7 @@ function CheckCurrentConfigAll { tmp="$SKIP_DELETION" IFS=',' read -r -a SKIP_DELETION <<< "$tmp" if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ] && [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ]; then - Logger "Bogus skip deletion parameter [$SKIP_DELETION]." "CRITICAL" + Logger "Bogus skip deletion parameter [${SKIP_DELETION[@]}]." "CRITICAL" exit 1 fi fi @@ -6266,6 +6266,9 @@ else exit 1 fi +# Reload GetCommandLineArguments so we can override config file with run time arguments +GetCommandlineArguments "${@}" + if [ "$LOGFILE" == "" ]; then if [ -w /var/log ]; then LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log"