@ -51,14 +51,17 @@ proc rsyncThread(list: RoutineListState) {.thread.} =
for source in routine . sources :
for destination in routine . destinations :
#try without requiring superuser privs by default.
rsyncRunCmd = " rsync -aq " & source & " " & destination
#rsyncRunCmd = "rsync -aq " & source & " " & destination
#quote sources and destinations to handle possible spaces.
rsyncRunCmd = " rsync -aq " & " ' " & source & " ' " & " " & " ' " & destination & " ' "
rsyncRun = execCmdEx ( rsyncRunCmd )
if rsyncRun . exitCode ! = 0 :
#handle permission denied error.
if rsyncRun . exitCode = = 23 :
rsyncRun . exitCode = 0
#rsyncRunCmd = "SUDO_ASKPASS=" & getAskPassPath() & " sudo -A rsync -aq " & source & " " & destination
rsyncRunCmd = " pkexec rsync -aq " & source & " " & destination
rsyncRun . exitCode = 0
#rsyncRunCmd = "pkexec rsync -aq " & source & " " & destination
#quote sources and destinations to handle possible spaces.
rsyncRunCmd = " pkexec rsync -aq " & " ' " & source & " ' " & " " & " ' " & destination & " ' "
rsyncRun = execCmdEx ( rsyncRunCmd )
if rsyncRun . exitCode ! = 0 :
rsyncErrors . add ( " EZ-Bkup ' s rsync process(es) returned error ( " & $ rsyncRun . output & " ) while attempting to back up " & source & " to " & destination )
@ -66,15 +69,18 @@ proc rsyncThread(list: RoutineListState) {.thread.} =
else :
rsyncErrors . add ( " EZ-Bkup ' s rsync process(es) returned error ( " & $ rsyncRun . output & " ) while attempting to back up " & source & " to " & destination )
#explicitly check that sources were copied to destinations.
#just using file names, mod times, and size (same as bkup run itself).
rsyncCheckCmd = " rsync -rn " & source & " " & destination
#just using file names, mod times, and size (same as bkup run itself).
#quote sources and destinations to handle possible spaces.
#rsyncCheckCmd = "rsync -rn " & source & " " & destination
rsyncCheckCmd = " rsync -rn " & " ' " & source & " ' " & " " & " ' " & destination & " ' "
rsyncCheckRun = execCmdEx ( rsyncCheckCmd )
if rsyncCheckRun . exitCode ! = 0 :
#handle permission denied error.
if rsyncCheckRun . exitCode = = 23 :
rsyncCheckRun . exitCode = 0
#rsyncCheckCmd = "SUDO_ASKPASS=" & getAskPassPath() & " sudo -A rsync -rn " & source & " " & destination
rsyncCheckCmd = " pkexec rsync -rn " & source & " " & destination
rsyncCheckRun . exitCode = 0
#quote sources and destinations to handle possible spaces.
#rsyncCheckCmd = "pkexec rsync -rn " & source & " " & destination
rsyncCheckCmd = " pkexec rsync -rn " & " ' " & source & " ' " & " " & " ' " & destination & " ' "
rsyncCheckRun = execCmdEx ( rsyncCheckCmd )
if rsyncCheckRun . exitCode ! = 0 :
rsyncErrors . add ( " EZ-Bkup ' s rsync process(es) returned error ( " & $ rsyncRun . output & " ) while attempting to verify that " & source & " got backed up to " & destination )