Fix Squidly271#5 - add wait $! which gives correct exit code back t…

…o us
Commifreak · Sep 7, 2022 · 83762f3 · 83762f3
1 parent f6f3f22
commit 83762f3
Showing 1 changed file with 20 additions and 15 deletions.
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
@@ -177,32 +177,37 @@ function backupLog($msg) {
 logger("$logLine appData from $source to $destination"); backupLog("$logLine appData from $source to $destination");
 if ( ! $restore ) {
 	if ( is_dir($source) ) {
-		$command = "cd ".escapeshellarg($source)." && /usr/bin/tar -cvaf ".escapeshellarg("{$destination}/CA_backup$fileExt")." $rsyncExcluded * >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']}";
+		$command = "cd ".escapeshellarg($source)." && /usr/bin/tar -cvaf ".escapeshellarg("{$destination}/CA_backup$fileExt")." $rsyncExcluded * >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['backupProgress']} && wait $!";
 		exec("mkdir -p ".escapeshellarg($destination));
 		exec("chmod 0777 ".escapeshellarg($destination));
 	} else {
 		logger("Appdata not backed up.  Missing source");
 		$missingSource = true;
 	}
 } else {
-	$command = "cd ".escapeshellarg($restoreDestination)." && /usr/bin/tar -xvaf ".escapeshellarg($restoreFile)." >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['restoreProgress']}";
+	$command = "cd ".escapeshellarg($restoreDestination)." && /usr/bin/tar -xvaf ".escapeshellarg($restoreFile)." >> {$communityPaths['backupLog']} 2>&1 & echo $! > {$communityPaths['restoreProgress']} && wait $!";
 	exec("mkdir -p ".escapeshellarg($restoreDestination));
 }
 logger('Using command: '.$command); backupLog("Executing tar: $command");
-exec($command);
-if ( ! $restore )
-	exec("chmod 0777 ".escapeshellarg("{$destination}/CA_backup$fileExt"));
+exec($command,$out,$returnValue);
+if ( $returnValue > 0 )	{
+        logger("tar creation failed!"); backupLog("tar creation failed!");
+        $tarErrors = file_get_contents($communityPaths['backupLog']);
+    } else {
+    if (!$restore)
+        exec("chmod 0777 " . escapeshellarg("{$destination}/CA_backup$fileExt"));
 
-logger("$restoreMsg Complete");
-if ( $backupOptions['verify'] == "yes" && ! $restore) {
-	$command = "cd ".escapeshellarg("$source")." && /usr/bin/tar --diff -C '$source' -af ".escapeshellarg("$destination/CA_backup$fileExt")." > {$communityPaths['backupLog']} & echo $! > {$communityPaths['verifyProgress']}";
-	logger("Verifying backup"); backupLog("Verifying Backup");
-	logger("Using command: $command"); backupLog("Using command: $command");
-	exec($command,$out,$returnValue);
-	unlink($communityPaths['verifyProgress']);
-	if ( $returnValue > 0 )	{
-		$tarErrors = file_get_contents($communityPaths['backupLog']);
-	}
+    logger("$restoreMsg Complete");
+    if ($backupOptions['verify'] == "yes" && !$restore) {
+        $command = "cd " . escapeshellarg("$source") . " && /usr/bin/tar --diff -C '$source' -af " . escapeshellarg("$destination/CA_backup$fileExt") . " > {$communityPaths['backupLog']} & echo $! > {$communityPaths['verifyProgress']} && wait $!";
+        logger("Verifying backup"); backupLog("Verifying Backup");
+        logger("Using command: $command"); backupLog("Using command: $command");
+        exec($command, $out, $returnValue);
+        unlink($communityPaths['verifyProgress']);
+        if ($returnValue > 0) {
+            $tarErrors = file_get_contents($communityPaths['backupLog']);
+        }
+    }
 }
 
 if ( $backupOptions['updateApps'] == "yes" && is_file("/var/log/plugins/ca.update.applications.plg") ) {