|
|
@ -45,16 +45,14 @@ proc rsyncThread(list: RoutineListState) {.thread.} = |
|
|
|
routineRuncount += 1 |
|
|
|
routineRuncount += 1 |
|
|
|
for source in routine.sources: |
|
|
|
for source in routine.sources: |
|
|
|
for destination in routine.destinations: |
|
|
|
for destination in routine.destinations: |
|
|
|
#try without requiring superuser privs by default. |
|
|
|
#try without requiring superuser privs by default. |
|
|
|
#rsyncRunCmd = "rsync -aq " & source & " " & destination |
|
|
|
|
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
rsyncRunCmd = "rsync -aq " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncRunCmd = "rsync -aq " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncRun = execCmdEx(rsyncRunCmd) |
|
|
|
rsyncRun = execCmdEx(rsyncRunCmd) |
|
|
|
if rsyncRun.exitCode != 0: |
|
|
|
if rsyncRun.exitCode != 0: |
|
|
|
#handle permission denied error. |
|
|
|
#handle permission denied error. |
|
|
|
if rsyncRun.exitCode == 23: |
|
|
|
if rsyncRun.exitCode == 23: |
|
|
|
rsyncRun.exitCode = 0 |
|
|
|
rsyncRun.exitCode = 0 |
|
|
|
#rsyncRunCmd = "pkexec rsync -aq " & source & " " & destination |
|
|
|
|
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
rsyncRunCmd = "pkexec rsync -aq " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncRunCmd = "pkexec rsync -aq " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncRun = execCmdEx(rsyncRunCmd) |
|
|
|
rsyncRun = execCmdEx(rsyncRunCmd) |
|
|
@ -66,15 +64,13 @@ proc rsyncThread(list: RoutineListState) {.thread.} = |
|
|
|
#explicitly check that sources were copied to destinations. |
|
|
|
#explicitly check that sources were copied to destinations. |
|
|
|
#just using file names, mod times, and size (same as bkup run itself). |
|
|
|
#just using file names, mod times, and size (same as bkup run itself). |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#rsyncCheckCmd = "rsync -rn " & source & " " & destination |
|
|
|
|
|
|
|
rsyncCheckCmd = "rsync -rn " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncCheckCmd = "rsync -rn " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncCheckRun = execCmdEx(rsyncCheckCmd) |
|
|
|
rsyncCheckRun = execCmdEx(rsyncCheckCmd) |
|
|
|
if rsyncCheckRun.exitCode != 0: |
|
|
|
if rsyncCheckRun.exitCode != 0: |
|
|
|
#handle permission denied error. |
|
|
|
#handle permission denied error. |
|
|
|
if rsyncCheckRun.exitCode == 23: |
|
|
|
if rsyncCheckRun.exitCode == 23: |
|
|
|
rsyncCheckRun.exitCode = 0 |
|
|
|
rsyncCheckRun.exitCode = 0 |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#quote sources and destinations to handle possible spaces. |
|
|
|
#rsyncCheckCmd = "pkexec rsync -rn " & source & " " & destination |
|
|
|
|
|
|
|
rsyncCheckCmd = "pkexec rsync -rn " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncCheckCmd = "pkexec rsync -rn " & "'" & source & "'" & " " & "'" & destination & "'" |
|
|
|
rsyncCheckRun = execCmdEx(rsyncCheckCmd) |
|
|
|
rsyncCheckRun = execCmdEx(rsyncCheckCmd) |
|
|
|
if rsyncCheckRun.exitCode != 0: |
|
|
|
if rsyncCheckRun.exitCode != 0: |
|
|
|