Hotfix: Exclude defined subfolders as well

Commifreak · Commifreak · commit 3d330f84c50d · 2022-12-05T17:21:38.000+01:00
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
@@ -225,7 +225,7 @@ function backupLog($msg, $newLine = true, $skipDate = false)
                     // Ignore . and .. and excluded folders
                     continue;
                 }
-                $commands[$srcFolderEntry] = "cd " . escapeshellarg($source) . " && /usr/bin/tar -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") . " $srcFolderEntry >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']} && wait $!";
             }
         } else {
             backupLog("Separate archives disabled! Saving into one file.");

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ function backupLog($msg, $newLine = true, $skipDate = false)`
`225`	`225`	`// Ignore . and .. and excluded folders`
`226`	`226`	`continue;`
`227`	`227`	`}`
`228`		`- $commands[$srcFolderEntry] = "cd " . escapeshellarg($source) . " && /usr/bin/tar -caf " . escapeshellarg("{$destination}/CA_backup_$srcFolderEntry$fileExt") . " $srcFolderEntry >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']} && wait $!";`
	`228`	`+ $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 $!";`
`229`	`229`	`}`
`230`	`230`	`} else {`
`231`	`231`	`backupLog("Separate archives disabled! Saving into one file.");`