diff --git a/views/routine_list.nim b/views/routine_list.nim index d8dee57..6d8f498 100644 --- a/views/routine_list.nim +++ b/views/routine_list.nim @@ -45,16 +45,14 @@ proc rsyncThread(list: RoutineListState) {.thread.} = routineRuncount += 1 for source in routine.sources: for destination in routine.destinations: - #try without requiring superuser privs by default. - #rsyncRunCmd = "rsync -aq " & source & " " & destination + #try without requiring superuser privs by default. #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 = "pkexec rsync -aq " & source & " " & destination + rsyncRun.exitCode = 0 #quote sources and destinations to handle possible spaces. rsyncRunCmd = "pkexec rsync -aq " & "'" & source & "'" & " " & "'" & destination & "'" rsyncRun = execCmdEx(rsyncRunCmd) @@ -66,15 +64,13 @@ proc rsyncThread(list: RoutineListState) {.thread.} = #explicitly check that sources were copied to destinations. #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 - #quote sources and destinations to handle possible spaces. - #rsyncCheckCmd = "pkexec rsync -rn " & source & " " & destination + #quote sources and destinations to handle possible spaces. rsyncCheckCmd = "pkexec rsync -rn " & "'" & source & "'" & " " & "'" & destination & "'" rsyncCheckRun = execCmdEx(rsyncCheckCmd) if rsyncCheckRun.exitCode != 0: