diff --git a/source/ca.backup2/usr/local/emhttp/plugins/ca.backup2/scripts/backup.php b/source/ca.backup2/usr/local/emhttp/plugins/ca.backup2/scripts/backup.php index f9844fb..aee4b7b 100644 --- a/source/ca.backup2/usr/local/emhttp/plugins/ca.backup2/scripts/backup.php +++ b/source/ca.backup2/usr/local/emhttp/plugins/ca.backup2/scripts/backup.php @@ -145,6 +145,8 @@ function backupLog($msg, $newLine = true, $skipDate = false) backupLog("done! (took " . (time() - $stopTimer) . " seconds)", true, true); } + } else { + backupLog("Not stopping {$docker['Name']}: Not started! [{$docker['Paused']} / {$docker['Status']}]"); } } } @@ -225,7 +227,7 @@ function backupLog($msg, $newLine = true, $skipDate = false) // Ignore . and .. and excluded folders continue; } - $commands[$srcFolderEntry] = "cd " . escapeshellarg($source) . " && /usr/bin/tar $rsyncExcluded -caf " . escapeshellarg("{$destination}/CA_backup_$srcFolderEntry$fileExt") . " $srcFolderEntry >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']} && wait $!"; + $commands[$srcFolderEntry] = "cd " . escapeshellarg($source) . " && /usr/bin/tar $rsyncExcluded -caf " . escapeshellarg("{$destination}/CA_backup_$srcFolderEntry$fileExt") . " ".escapeshellarg($srcFolderEntry)." >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']} && wait $!"; } } else { backupLog("Separate archives disabled! Saving into one file."); @@ -459,7 +461,7 @@ function backupLog($msg, $newLine = true, $skipDate = false) if (!$restore) { if ($backupOptions['deleteOldBackup'] && !$missingSource) { if ($errorOccured) { - backupLog("A error occured somewhere. Not deleting old backup sets of appdata"); + backupLog("A error occurred somewhere. Not deleting old backup sets of appdata"); exec("mv " . escapeshellarg($destination) . " " . escapeshellarg("$destination-error")); } else { $currentDate = date_create("now");