#TODO treeList, deleteList, _getFileCtimeMtime, conflictList should be called without having statedir informed. Just give the full path ?
#TODO add error handling to new functions
#TODO replace renameTimestampFiles with another _getFileCtimeMtime run in order to get real values after execution
#TODO check if _getCtimeMtime | sort removal needs to be backported
PROGRAM="osync"# Rsync based two way sync engine with fault tolerance
@ -3056,8 +3055,6 @@ function _getFileCtimeMtimeRemote {
localfileList="${3}"
localtimestampFile="${4}"
#WIP change output file to timestampFile
__CheckArguments 4$#"$@"#__WITH_PARANOIA_DEBUG
local retval
@ -3157,13 +3154,9 @@ function conflictList {
Logger "Creating conflictual file list.""NOTICE"
#WIP --nocheck-order or check why comm is complaining
comm -23 "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__type]}$timestampCurrentFilename""${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__type]}$timestampAfterFilename" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${INITIATOR[$__type]}.$SCRIPT_PID.$TSTAMP"
comm -23 "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${TARGET[$__type]}$timestampCurrentFilename""${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${TARGET[$__type]}$timestampAfterFilename" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${TARGET[$__type]}.$SCRIPT_PID.$TSTAMP"
#TODO treeList, deleteList, _getFileCtimeMtime, conflictList should be called without having statedir informed. Just give the full path ?
#TODO add error handling to new functions
#TODO replace renameTimestampFiles with another _getFileCtimeMtime run in order to get real values after execution
#TODO check if _getCtimeMtime | sort removal needs to be backported
PROGRAM="osync"# Rsync based two way sync engine with fault tolerance
@ -2865,8 +2864,6 @@ function _getFileCtimeMtimeRemote {
localfileList="${3}"
localtimestampFile="${4}"
#WIP change output file to timestampFile
local retval
local cmd
@ -2963,13 +2960,9 @@ function conflictList {
Logger "Creating conflictual file list.""NOTICE"
#WIP --nocheck-order or check why comm is complaining
comm -23 "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__type]}$timestampCurrentFilename""${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${INITIATOR[$__type]}$timestampAfterFilename" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${INITIATOR[$__type]}.$SCRIPT_PID.$TSTAMP"
comm -23 "${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${TARGET[$__type]}$timestampCurrentFilename""${INITIATOR[$__replicaDir]}${INITIATOR[$__stateDir]}/${TARGET[$__type]}$timestampAfterFilename" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${TARGET[$__type]}.$SCRIPT_PID.$TSTAMP"