Merge pull request openWB#812 from benderl/fix-backup

benderl · web-flow · commit 6d9fa23c7c4b · 2025-10-21T12:47:04.000+02:00
Backport backup fixes
diff --git a/public/uploadFile.php b/public/uploadFile.php
@@ -21,11 +21,11 @@ function check_gzip() {
 // quick check for file contents
 function check_restore_file_contents() {
 	$output = null;
-	$result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" | grep -c \"^\(mosquitto/\|mosquitto_local/\|GIT_HASH\|GIT_BRANCH\|SHA256SUM\|backup.log\)$\"", $output);
+	$result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" | egrep -c \"^(mosquitto/.+|mosquitto_local/.+|GIT_HASH|GIT_BRANCH|SHA256SUM|backup.log)$\"", $output);
 	if ($result === false || $result != "6") {
 		exit_with_error("Prüfung des Archivinhalts fehlgeschlagen! Das Archiv ist unvollständig.");
 	}
-	$result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" | grep -c \"^openWB/.*\"", $output);
+	$result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" | grep -c \"^openWB/\"", $output);
 	if ($result === false || $result <= 4) {
 		exit_with_error("Prüfung des Archivinhalts fehlgeschlagen! Das Archiv ist unvollständig.");
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ function check_gzip() {`
`21`	`21`	`// quick check for file contents`
`22`	`22`	`function check_restore_file_contents() {`
`23`	`23`	`$output = null;`
`24`		`- $result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" \| grep -c \"^\(mosquitto/\\|mosquitto_local/\\|GIT_HASH\\|GIT_BRANCH\\|SHA256SUM\\|backup.log\)$\"", $output);`
	`24`	`+ $result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" \| egrep -c \"^(mosquitto/.+\|mosquitto_local/.+\|GIT_HASH\|GIT_BRANCH\|SHA256SUM\|backup.log)$\"", $output);`
`25`	`25`	`if ($result === false \|\| $result != "6") {`
`26`	`26`	`exit_with_error("Prüfung des Archivinhalts fehlgeschlagen! Das Archiv ist unvollständig.");`
`27`	`27`	`}`
`28`		`- $result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" \| grep -c \"^openWB/.*\"", $output);`
	`28`	`+ $result = exec("tar --list --file=\"" . $_FILES["file"]["tmp_name"] . "\" \| grep -c \"^openWB/\"", $output);`
`29`	`29`	`if ($result === false \|\| $result <= 4) {`
`30`	`30`	`exit_with_error("Prüfung des Archivinhalts fehlgeschlagen! Das Archiv ist unvollständig.");`
`31`	`31`	`}`