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

Fixed litteral 'synced' state instead of step

This commit is contained in:
deajan 2019-05-20 12:13:24 +02:00
parent efeb665818
commit 0d501209fa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/n_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-pre-rc1 PROGRAM_VERSION=1.3.0-pre-rc1
PROGRAM_BUILD=2019052005 PROGRAM_BUILD=2019052006
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -1699,23 +1699,23 @@ function Sync {
if [ -f "${INITIATOR[$__initiatorLastActionFile]}" ]; then if [ -f "${INITIATOR[$__initiatorLastActionFile]}" ]; then
resumeInitiator=$(cat "${INITIATOR[$__initiatorLastActionFile]}") resumeInitiator=$(cat "${INITIATOR[$__initiatorLastActionFile]}")
else else
resumeInitiator="synced" resumeInitiator="${SYNC_ACTION[9]}"
fi fi
if [ -f "${INITIATOR[$__targetLastActionFile]}" ]; then if [ -f "${INITIATOR[$__targetLastActionFile]}" ]; then
resumeTarget=$(cat "${INITIATOR[$__targetLastActionFile]}") resumeTarget=$(cat "${INITIATOR[$__targetLastActionFile]}")
else else
resumeTarget="synced" resumeTarget="${SYNC_ACTION[9]}"
fi fi
if [ "$resumeInitiator" != "synced" ]; then if [ "$resumeInitiator" != "${SYNC_ACTION[9]}" ]; then
Logger "Trying to resume aborted execution on $($STAT_CMD "${INITIATOR[$__initiatorLastActionFile]}") at task [$resumeInitiator] for initiator. [$resumeCount] previous tries." "NOTICE" Logger "Trying to resume aborted execution on $($STAT_CMD "${INITIATOR[$__initiatorLastActionFile]}") at task [$resumeInitiator] for initiator. [$resumeCount] previous tries." "NOTICE"
echo $((resumeCount+1)) > "${INITIATOR[$__resumeCount]}" echo $((resumeCount+1)) > "${INITIATOR[$__resumeCount]}"
else else
resumeInitiator="none" resumeInitiator="none"
fi fi
if [ "$resumeTarget" != "synced" ]; then if [ "$resumeTarget" != "${SYNC_ACTION[9]}" ]; then
Logger "Trying to resume aborted execution on $($STAT_CMD "${INITIATOR[$__targetLastActionFile]}") as task [$resumeTarget] for target. [$resumeCount] previous tries." "NOTICE" Logger "Trying to resume aborted execution on $($STAT_CMD "${INITIATOR[$__targetLastActionFile]}") as task [$resumeTarget] for target. [$resumeCount] previous tries." "NOTICE"
echo $((resumeCount+1)) > "${INITIATOR[$__resumeCount]}" echo $((resumeCount+1)) > "${INITIATOR[$__resumeCount]}"
else else