WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuilt targets

This commit is contained in:
deajan 2019-05-20 23:31:26 +02:00
parent 3edd80949f
commit c089ccc63b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/debug_osync.sh
View File

@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2019 by Orsiris de Jong" AUTHOR="(C) 2013-2019 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.3.0-beta2 PROGRAM_VERSION=1.3.0-beta2
PROGRAM_BUILD=2019052015 PROGRAM_BUILD=2019052016
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -2574,7 +2574,7 @@ function CheckCurrentConfigAll {
tmp="$SKIP_DELETION" tmp="$SKIP_DELETION"
IFS=',' read -r -a SKIP_DELETION <<< "$tmp" IFS=',' read -r -a SKIP_DELETION <<< "$tmp"
if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ] && [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ]; then 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 exit 1
fi fi
fi fi
@ -6508,6 +6508,9 @@ else
exit 1 exit 1
fi fi
# Reload GetCommandLineArguments so we can override config file with run time arguments
GetCommandlineArguments "${@}"
if [ "$LOGFILE" == "" ]; then if [ "$LOGFILE" == "" ]; then
if [ -w /var/log ]; then if [ -w /var/log ]; then
LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log"

7
osync.sh
View File

@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2019 by Orsiris de Jong" AUTHOR="(C) 2013-2019 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.3.0-beta2 PROGRAM_VERSION=1.3.0-beta2
PROGRAM_BUILD=2019052015 PROGRAM_BUILD=2019052016
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -2422,7 +2422,7 @@ function CheckCurrentConfigAll {
tmp="$SKIP_DELETION" tmp="$SKIP_DELETION"
IFS=',' read -r -a SKIP_DELETION <<< "$tmp" IFS=',' read -r -a SKIP_DELETION <<< "$tmp"
if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ] && [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -eq 0 ]; then 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 exit 1
fi fi
fi fi
@ -6266,6 +6266,9 @@ else
exit 1 exit 1
fi fi
# Reload GetCommandLineArguments so we can override config file with run time arguments
GetCommandlineArguments "${@}"
if [ "$LOGFILE" == "" ]; then if [ "$LOGFILE" == "" ]; then
if [ -w /var/log ]; then if [ -w /var/log ]; then
LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log" LOG_FILE="/var/log/$PROGRAM.$INSTANCE_ID.log"