From 78727c7d874d74e9b9b9e6cda3eeacaf2d82646d Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Mon, 22 Aug 2022 15:32:02 +0200
Subject: [PATCH 1/9] rework backup and restore

---
 runs/backup.sh          | 40 +++++++++++++++++++++++++++++++++
 runs/restore.sh         | 49 +++++++++++++++++++++++++----------------
 web/settings/backup.php | 39 ++++++++++++++------------------
 web/settings/upload.php |  5 ++---
 4 files changed, 89 insertions(+), 44 deletions(-)
 create mode 100644 runs/backup.sh

diff --git a/runs/backup.sh b/runs/backup.sh
new file mode 100644
index 000000000..76e9e7141
--- /dev/null
+++ b/runs/backup.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+OPENWBBASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+BACKUPDIR="$OPENWBBASEDIR/web/backup"
+. "$OPENWBBASEDIR/helperFunctions.sh"
+
+backup() {
+	openwbDebugLog MAIN 0 "creating new backup: $FILENAME"
+	# remove old backup files
+	openwbDebugLog MAIN 1 "deleting old backup files if present"
+	rm "$BACKUPDIR/"*
+	BACKUPFILE="$BACKUPDIR/$FILENAME"
+
+	# tell mosquitto to store all retained topics in db now
+	for pid in $(pidof "mosquitto"); do
+		openwbDebugLog MAIN 1 "sending 'SIGUSR1' to mosquitto on pid '$pid'"
+		sudo kill -s SIGUSR1 "$pid"
+	done
+	# give mosquitto some time to finish
+	sleep 0.2
+
+	# create backup file
+	openwbDebugLog MAIN 1 "creating new backup file: $BACKUPFILE"
+	sudo tar --exclude="$OPENWBBASEDIR/web/backup" --exclude="$OPENWBBASEDIR/.git" -czf "$BACKUPFILE" "$OPENWBBASEDIR/" "/var/lib/mosquitto/"
+	openwbDebugLog MAIN 1 "setting permissions of new backup file"
+	sudo chown pi:www-data "$BACKUPFILE"
+	sudo chmod 664 "$BACKUPFILE"
+
+	openwbDebugLog MAIN 0 "backup finished"
+}
+
+useExtendedFilename=$1
+if ((useExtendedFilename == 1)); then
+	FILENAME="openWB_backup_$(date +"%Y-%m-%d_%H:%M:%S").tar.gz"
+else
+	FILENAME="backup.tar.gz"
+fi
+
+openwbRunLoggingOutput backup "$FILENAME"
+# return our filename for further processing
+echo "$FILENAME"
diff --git a/runs/restore.sh b/runs/restore.sh
index f594781ed..5a2111d87 100755
--- a/runs/restore.sh
+++ b/runs/restore.sh
@@ -1,20 +1,31 @@
 #!/bin/bash
-echo "****************************************"
-echo "Step 1: moving file to home directory..."
-sudo cp /var/www/html/openWB/web/tools/upload/backup.tar.gz /home/pi/backup.tar.gz
-cd /home/pi/
-echo "****************************************"
-echo "Step 2: extracting archive..."
-sudo tar -vxf backup.tar.gz
-echo "****************************************"
-echo "Step 3: replacing old files..."
-sudo cp -v -R /home/pi/var/www/html/openWB/* /var/www/html/openWB/
-sudo chmod 777 /var/www/html/openWB/openwb.conf
-echo "****************************************"
-echo "Step 4: cleanup after restore..."
-sudo rm /var/www/html/openWB/web/tools/upload/backup.tar.gz
-sudo rm /home/pi/backup.tar.gz
-sudo rm -R /home/pi/var
-echo "****************************************"
-echo "End: Restore finished."
-echo "****************************************"
+OPENWBBASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+SOURCEFILE="$OPENWBBASEDIR/web/tools/upload/backup.tar.gz"
+WORKINGDIR="/home/pi/openwb_restore"
+LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
+
+{
+	echo "$(date +"%Y-%m-%d %H:%M:%S") Restore of backup started..."
+	echo "****************************************"
+	echo "Step 1: creating working directory \"$WORKINGDIR\""
+	mkdir -p "$WORKINGDIR"
+	echo "****************************************"
+	echo "Step 2: extracting archive to working dir \"$WORKINGDIR\"..."
+	sudo tar -vxf "$SOURCEFILE" -C "$WORKINGDIR"
+	echo "****************************************"
+	echo "Step 3: replacing old files..."
+	cp -v -R -p "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}R/"
+	echo "****************************************"
+	echo "Step 4: restoring mosquitto db..."
+	sudo systemctl stop mosquitto.service
+	sleep 2
+	sudo cp -v -p "$WORKINGDIR/var/lib/mosquitto/mosquitto.db" "/var/lib/mosquitto/mosquitto.db"
+	sudo systemctl start mosquitto.service
+	echo "****************************************"
+	echo "Step 5: cleanup after restore..."
+	sudo rm "$SOURCEFILE"
+	sudo rm -R "$WORKINGDIR"
+	echo "****************************************"
+	echo "$(date +"%Y-%m-%d %H:%M:%S") End: Restore finished."
+	echo "****************************************"
+} >"$LOGFILE" 2>&1
diff --git a/web/settings/backup.php b/web/settings/backup.php
index 5d7e1699e..d1d0236c3 100644
--- a/web/settings/backup.php
+++ b/web/settings/backup.php
@@ -1,22 +1,12 @@
 <?php
 	// if parameter extendedFilename is passed with value 1 the filename changes
 	// from backup.tar.gz to openWB_backup_YYYY-MM-DD_HH-MM-SS.tar.gz
-	$useExtendedFilename = false;
+	$useExtendedFilename = 0;
 	if( isset($_GET["extendedFilename"]) && $_GET["extendedFilename"] == "1") {
-		$useExtendedFilename = true;
+		$useExtendedFilename = 1;
 	}
-	$backupPath = "/var/www/html/openWB/web/backup/";
-	$timestamp = date("Y-m-d") . "_" . date("H-i-s");
-	if ( $useExtendedFilename ) {
-		$filename = "openWB_backup_" . $timestamp . ".tar.gz" ;
-	} else {
-		$filename = "backup.tar.gz" ;
-	}
-
-	// first empty backup-directory
-	array_map( "unlink", array_filter((array) glob($backupPath . "*") ) );
-	// then create new backup-file
-	exec("tar --exclude='/var/www/html/openWB/web/backup' --exclude='/var/www/html/openWB/.git' -czf ". $backupPath . $filename . " /var/www/html/");
+	// execute backup script
+	$filename = exec("sudo -u pi " . $_SERVER['DOCUMENT_ROOT'] . "/openWB/runs/backup.sh " . $useExtendedFilename, $output, $result);
 ?>
 <!DOCTYPE html>
 <html lang="de">
@@ -62,16 +52,21 @@
 		<div role="main" class="container" style="margin-top:20px">
 
 			<h1>Backup erstellen</h1>
-			<div class="alert alert-success">
-				Backup-Datei <?php echo $filename; ?> erfolgreich erstellt.
-			</div>
-
-			<div class="row">
-				<div class="col text-center">
-					<a class="btn btn-success" href="/openWB/web/backup/<?php echo $filename; ?>" target="_blank"><i class="fas fa-download"></i> Backup herunterladen</a>
+			<?php if ($filename !== false && $result == 0) { ?>
+				<div class="alert alert-success">
+					Backup-Datei <?php echo $filename; ?> erfolgreich erstellt.
 				</div>
-			</div>
 
+				<div class="row">
+					<div class="col text-center">
+						<a class="btn btn-success" href="/openWB/web/backup/<?php echo $filename; ?>" target="_blank"><i class="fas fa-download"></i> Backup herunterladen</a>
+					</div>
+				</div>
+			<?php } else { ?>
+				<div class="alert alert-danger">
+					Es gab einen Fehler beim Erstellen der Backup-Datei. Bitte die Logmeldungen prüfen!
+				</div>
+			<?php } ?>
 		</div>  <!-- container -->
 
 		<footer class="footer bg-dark text-light font-small">
diff --git a/web/settings/upload.php b/web/settings/upload.php
index ed1a44390..3623b5623 100644
--- a/web/settings/upload.php
+++ b/web/settings/upload.php
@@ -92,7 +92,7 @@ function parse_size($size) {
 				if ( $ext != "gz" ) {
 			?>
 					<div class="alert alert-danger">
-						Die Datei ist keine Zip-Datei, die Wiederherstellung wurde abgebrochen.
+						Die Datei ist keine Tar-GZip-Datei, die Wiederherstellung wurde abgebrochen.
 					</div>
 			<?php
 				} elseif ( $_FILES["fileToUpload"]["size"] > file_upload_max_size() ) {
@@ -139,8 +139,7 @@ function(data){
 		</script>
 		<?php
 			if($uploadOk === true) {
-				sleep(5);
-				exec($_SERVER['DOCUMENT_ROOT']."/openWB/runs/restore.sh >> ".$_SERVER['DOCUMENT_ROOT']."/openWB/web/tools/upload/restore.log");
+				exec("sudo -u pi " . $_SERVER['DOCUMENT_ROOT'] . "/openWB/runs/restore.sh");
 				?>
 					<script>
 						setTimeout(function() { window.location = "index.php"; }, 15000);

From 85d85016ad854b13fb51fe8037e9a0b88045030f Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Fri, 26 Aug 2022 09:40:49 +0200
Subject: [PATCH 2/9] implement suggested changes

---
 runs/backup.sh  |  6 ++----
 runs/reboot.sh  |  3 +--
 runs/restore.sh | 32 +++++++++++++++++++++++---------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/runs/backup.sh b/runs/backup.sh
index 76e9e7141..0f5f7f340 100644
--- a/runs/backup.sh
+++ b/runs/backup.sh
@@ -11,10 +11,8 @@ backup() {
 	BACKUPFILE="$BACKUPDIR/$FILENAME"
 
 	# tell mosquitto to store all retained topics in db now
-	for pid in $(pidof "mosquitto"); do
-		openwbDebugLog MAIN 1 "sending 'SIGUSR1' to mosquitto on pid '$pid'"
-		sudo kill -s SIGUSR1 "$pid"
-	done
+	openwbDebugLog MAIN 1 "sending 'SIGUSR1' to mosquitto"
+	sudo pkill -SIGUSR1 mosquitto
 	# give mosquitto some time to finish
 	sleep 0.2
 
diff --git a/runs/reboot.sh b/runs/reboot.sh
index fad02d527..96e0882dd 100755
--- a/runs/reboot.sh
+++ b/runs/reboot.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-
 sudo rm /var/log/openWB.log
 sudo touch /var/log/openWB.log
 sudo chmod 777 /var/log/openWB.log
-$(sleep 5 && sudo reboot now)&
+$(sleep 5 && sudo reboot now) &
diff --git a/runs/restore.sh b/runs/restore.sh
index 5a2111d87..0e6c96ec5 100755
--- a/runs/restore.sh
+++ b/runs/restore.sh
@@ -1,31 +1,45 @@
 #!/bin/bash
 OPENWBBASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+RAMDISKDIR="$OPENWBBASEDIR/ramdisk"
 SOURCEFILE="$OPENWBBASEDIR/web/tools/upload/backup.tar.gz"
 WORKINGDIR="/home/pi/openwb_restore"
+MOSQUITTODIR="/var/lib/mosquitto"
 LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
 
 {
 	echo "$(date +"%Y-%m-%d %H:%M:%S") Restore of backup started..."
 	echo "****************************************"
-	echo "Step 1: creating working directory \"$WORKINGDIR\""
+	echo "Step 1: setting flag 'update in progress' and wait for control loop to finish"
+	echo 1 > "$OPENWBBASEDIR/ramdisk/updateinprogress"
+	# Wait for regulation loop(s) and cron jobs to end, but with timeout in case a script hangs
+	pgrep -f "$OPENWBBASEDIR/(regel\\.sh|runs/cron5min\\.sh|runs/cronnightly\\.sh)$" | \
+		timeout 15 xargs -n1 -I'{}' tail -f --pid="{}" /dev/null
+	echo "****************************************"
+	echo "Step 2: creating working directory \"$WORKINGDIR\""
 	mkdir -p "$WORKINGDIR"
 	echo "****************************************"
-	echo "Step 2: extracting archive to working dir \"$WORKINGDIR\"..."
-	sudo tar -vxf "$SOURCEFILE" -C "$WORKINGDIR"
+	echo "Step 3: extracting archive to working dir \"$WORKINGDIR\"..."
+	if ! sudo tar -vxf "$SOURCEFILE" -C "$WORKINGDIR"; then
+		echo "something went wrong! aborting restore"
+		echo "Wiederherstellung fehlgeschlagen! Bitte Protokolldateien prüfen." >"$RAMDISKDIR/lastregelungaktiv"
+		echo 0 > "$OPENWBBASEDIR/ramdisk/updateinprogress"
+		exit 1
+	fi
 	echo "****************************************"
-	echo "Step 3: replacing old files..."
-	cp -v -R -p "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}R/"
+	echo "Step 4: replacing old files..."
+	mv -v -f "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}/"
 	echo "****************************************"
-	echo "Step 4: restoring mosquitto db..."
+	echo "Step 5: restoring mosquitto db..."
 	sudo systemctl stop mosquitto.service
 	sleep 2
-	sudo cp -v -p "$WORKINGDIR/var/lib/mosquitto/mosquitto.db" "/var/lib/mosquitto/mosquitto.db"
-	sudo systemctl start mosquitto.service
+	sudo mv -v -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" "$MOSQUITTODIR/mosquitto.db"
 	echo "****************************************"
-	echo "Step 5: cleanup after restore..."
+	echo "Step 6: cleanup after restore..."
 	sudo rm "$SOURCEFILE"
 	sudo rm -R "$WORKINGDIR"
 	echo "****************************************"
 	echo "$(date +"%Y-%m-%d %H:%M:%S") End: Restore finished."
+	echo "rebooting"
+	"$OPENWBBASEDIR/runs/reboot.sh"
 	echo "****************************************"
 } >"$LOGFILE" 2>&1

From 1b8f9019f82885666b83ee765af72c75f75a5063 Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Wed, 31 Aug 2022 11:43:28 +0200
Subject: [PATCH 3/9] use backupdir variable in tar command

---
 runs/backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runs/backup.sh b/runs/backup.sh
index 0f5f7f340..3eb4f81f5 100644
--- a/runs/backup.sh
+++ b/runs/backup.sh
@@ -18,7 +18,7 @@ backup() {
 
 	# create backup file
 	openwbDebugLog MAIN 1 "creating new backup file: $BACKUPFILE"
-	sudo tar --exclude="$OPENWBBASEDIR/web/backup" --exclude="$OPENWBBASEDIR/.git" -czf "$BACKUPFILE" "$OPENWBBASEDIR/" "/var/lib/mosquitto/"
+	sudo tar --exclude="$BACKUPDIR" --exclude="$OPENWBBASEDIR/.git" -czf "$BACKUPFILE" "$OPENWBBASEDIR/" "/var/lib/mosquitto/"
 	openwbDebugLog MAIN 1 "setting permissions of new backup file"
 	sudo chown pi:www-data "$BACKUPFILE"
 	sudo chmod 664 "$BACKUPFILE"

From cb9720f741a6c6b998a0465cd30ffc37827c04ef Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Mon, 19 Sep 2022 13:13:50 +0200
Subject: [PATCH 4/9] add reboot info to restore page

---
 web/settings/restore.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/settings/restore.php b/web/settings/restore.php
index 9c9322e36..cf712524c 100644
--- a/web/settings/restore.php
+++ b/web/settings/restore.php
@@ -43,6 +43,7 @@
 			<h1>openWB aus Backup wiederherstellen</h1>
 			<div class="alert alert-warning">
 				Wiederherstellen der openWB-Einstellungen und Log-Daten aus einer Backup-Datei (Dateiendung gz).<br>
+				Die openWB wird nach dem Wiederherstellen des Backups direkt neu gestartet! Bitte vorher alle Ladevorgänge beenden und Fahrzeuge zur Sicherheit abstecken.<br>
 				Sollte die Wiederherstellung fehlschlagen, bitte ein Update der openWB auf die gewünschte Version durchführen. Im Anschluss die openWB neu starten und das Wiederherstellen erneut versuchen.
 			</div>
 

From b22075f3b37632bcf8e47891c147cf94df25dcec Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Wed, 28 Sep 2022 10:50:26 +0200
Subject: [PATCH 5/9] log pkill signal

---
 runs/backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runs/backup.sh b/runs/backup.sh
index 3eb4f81f5..bfc666ac1 100644
--- a/runs/backup.sh
+++ b/runs/backup.sh
@@ -12,7 +12,7 @@ backup() {
 
 	# tell mosquitto to store all retained topics in db now
 	openwbDebugLog MAIN 1 "sending 'SIGUSR1' to mosquitto"
-	sudo pkill -SIGUSR1 mosquitto
+	sudo pkill -e -SIGUSR1 mosquitto
 	# give mosquitto some time to finish
 	sleep 0.2
 

From 81f1a16bb2835783d3cb812ec735c191abea1eb2 Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Wed, 12 Oct 2022 09:41:07 +0200
Subject: [PATCH 6/9] make restore of mosquitto.db optional

---
 runs/backup.sh  | 13 ++++++++-----
 runs/restore.sh | 18 +++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/runs/backup.sh b/runs/backup.sh
index bfc666ac1..412cc3f64 100644
--- a/runs/backup.sh
+++ b/runs/backup.sh
@@ -4,21 +4,24 @@ BACKUPDIR="$OPENWBBASEDIR/web/backup"
 . "$OPENWBBASEDIR/helperFunctions.sh"
 
 backup() {
-	openwbDebugLog MAIN 0 "creating new backup: $FILENAME"
+	# $1: name for new backup file
 	# remove old backup files
 	openwbDebugLog MAIN 1 "deleting old backup files if present"
 	rm "$BACKUPDIR/"*
-	BACKUPFILE="$BACKUPDIR/$FILENAME"
 
 	# tell mosquitto to store all retained topics in db now
 	openwbDebugLog MAIN 1 "sending 'SIGUSR1' to mosquitto"
-	sudo pkill -e -SIGUSR1 mosquitto
+	sudo pkill --echo -SIGUSR1 mosquitto
 	# give mosquitto some time to finish
 	sleep 0.2
 
 	# create backup file
-	openwbDebugLog MAIN 1 "creating new backup file: $BACKUPFILE"
-	sudo tar --exclude="$BACKUPDIR" --exclude="$OPENWBBASEDIR/.git" -czf "$BACKUPFILE" "$OPENWBBASEDIR/" "/var/lib/mosquitto/"
+	BACKUPFILE="$BACKUPDIR/$1"
+	openwbDebugLog MAIN 0 "creating new backup file: $BACKUPFILE"
+	sudo tar --verbose --create --gzip --file="$BACKUPFILE" \
+		--exclude="$BACKUPDIR" \
+		--exclude="$OPENWBBASEDIR/.git" \
+		"$OPENWBBASEDIR/" "/var/lib/mosquitto/"
 	openwbDebugLog MAIN 1 "setting permissions of new backup file"
 	sudo chown pi:www-data "$BACKUPFILE"
 	sudo chmod 664 "$BACKUPFILE"
diff --git a/runs/restore.sh b/runs/restore.sh
index 0e6c96ec5..b84ae688a 100755
--- a/runs/restore.sh
+++ b/runs/restore.sh
@@ -10,19 +10,19 @@ LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
 	echo "$(date +"%Y-%m-%d %H:%M:%S") Restore of backup started..."
 	echo "****************************************"
 	echo "Step 1: setting flag 'update in progress' and wait for control loop to finish"
-	echo 1 > "$OPENWBBASEDIR/ramdisk/updateinprogress"
+	echo 1 >"$OPENWBBASEDIR/ramdisk/updateinprogress"
 	# Wait for regulation loop(s) and cron jobs to end, but with timeout in case a script hangs
-	pgrep -f "$OPENWBBASEDIR/(regel\\.sh|runs/cron5min\\.sh|runs/cronnightly\\.sh)$" | \
+	pgrep -f "$OPENWBBASEDIR/(regel\\.sh|runs/cron5min\\.sh|runs/cronnightly\\.sh)$" |
 		timeout 15 xargs -n1 -I'{}' tail -f --pid="{}" /dev/null
 	echo "****************************************"
 	echo "Step 2: creating working directory \"$WORKINGDIR\""
 	mkdir -p "$WORKINGDIR"
 	echo "****************************************"
 	echo "Step 3: extracting archive to working dir \"$WORKINGDIR\"..."
-	if ! sudo tar -vxf "$SOURCEFILE" -C "$WORKINGDIR"; then
+	if ! sudo tar --verbose --extract --file="$SOURCEFILE" --directory="$WORKINGDIR"; then
 		echo "something went wrong! aborting restore"
 		echo "Wiederherstellung fehlgeschlagen! Bitte Protokolldateien prüfen." >"$RAMDISKDIR/lastregelungaktiv"
-		echo 0 > "$OPENWBBASEDIR/ramdisk/updateinprogress"
+		echo 0 >"$OPENWBBASEDIR/ramdisk/updateinprogress"
 		exit 1
 	fi
 	echo "****************************************"
@@ -30,9 +30,13 @@ LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
 	mv -v -f "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}/"
 	echo "****************************************"
 	echo "Step 5: restoring mosquitto db..."
-	sudo systemctl stop mosquitto.service
-	sleep 2
-	sudo mv -v -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" "$MOSQUITTODIR/mosquitto.db"
+	if [[ -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" ]]; then
+		sudo systemctl stop mosquitto.service
+		sleep 2
+		sudo mv -v -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" "$MOSQUITTODIR/mosquitto.db"
+	else
+		echo "Backup does not contain mosquitto.db. Skipping restore."
+	fi
 	echo "****************************************"
 	echo "Step 6: cleanup after restore..."
 	sudo rm "$SOURCEFILE"

From 149941e920bbb537b46af7bca1056614516fe259 Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Wed, 12 Oct 2022 15:37:02 +0200
Subject: [PATCH 7/9] fix copying files and folders

---
 helperFunctions.sh | 4 +++-
 runs/restore.sh    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/helperFunctions.sh b/helperFunctions.sh
index e76d00428..dd26d9e37 100755
--- a/helperFunctions.sh
+++ b/helperFunctions.sh
@@ -102,7 +102,9 @@ openwbDebugLog() {
 export -f openwbDebugLog
 
 openwbRunLoggingOutput() {
-	$1 2>&1 | while read -r line
+	functionName="$1"
+	shift
+	$functionName "$@" 2>&1 | while read -r line
 	do
 		# use path to /var/log as link in ramdisk may not be set up yet!
 		echo "$(date +"%Y-%m-%d %H:%M:%S"): $1: $line" >> "/var/log/openWB.log"
diff --git a/runs/restore.sh b/runs/restore.sh
index b84ae688a..625ac29f1 100755
--- a/runs/restore.sh
+++ b/runs/restore.sh
@@ -27,7 +27,9 @@ LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
 	fi
 	echo "****************************************"
 	echo "Step 4: replacing old files..."
-	mv -v -f "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}/"
+	# we use cp not mv because of not empty directories in destination
+	# dotglob is needed to include files and directories beginning with a dot
+	(shopt -s dotglob; sudo cp -v -p -r "${WORKINGDIR}${OPENWBBASEDIR}/"* "${OPENWBBASEDIR}/")
 	echo "****************************************"
 	echo "Step 5: restoring mosquitto db..."
 	if [[ -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" ]]; then

From 89c237452c9a2872142df31eadff6202c3d1c8da Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Thu, 13 Oct 2022 07:45:58 +0200
Subject: [PATCH 8/9] fix file permissions

---
 runs/backup.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 runs/backup.sh

diff --git a/runs/backup.sh b/runs/backup.sh
old mode 100644
new mode 100755

From 8c48c323e60e8faf01be5f47dae29ecbb40279a3 Mon Sep 17 00:00:00 2001
From: Lutz Bender <lutz@lutz-bender.de>
Date: Thu, 20 Oct 2022 12:57:27 +0200
Subject: [PATCH 9/9] suggested changes

---
 helperFunctions.sh      | 4 +---
 runs/restore.sh         | 3 +--
 web/settings/backup.php | 6 ++----
 web/settings/upload.php | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/helperFunctions.sh b/helperFunctions.sh
index dd26d9e37..82ec906ab 100755
--- a/helperFunctions.sh
+++ b/helperFunctions.sh
@@ -102,9 +102,7 @@ openwbDebugLog() {
 export -f openwbDebugLog
 
 openwbRunLoggingOutput() {
-	functionName="$1"
-	shift
-	$functionName "$@" 2>&1 | while read -r line
+	"$@" 2>&1 | while read -r line
 	do
 		# use path to /var/log as link in ramdisk may not be set up yet!
 		echo "$(date +"%Y-%m-%d %H:%M:%S"): $1: $line" >> "/var/log/openWB.log"
diff --git a/runs/restore.sh b/runs/restore.sh
index 625ac29f1..dccac44d6 100755
--- a/runs/restore.sh
+++ b/runs/restore.sh
@@ -28,8 +28,7 @@ LOGFILE="$OPENWBBASEDIR/web/tools/upload/restore.log"
 	echo "****************************************"
 	echo "Step 4: replacing old files..."
 	# we use cp not mv because of not empty directories in destination
-	# dotglob is needed to include files and directories beginning with a dot
-	(shopt -s dotglob; sudo cp -v -p -r "${WORKINGDIR}${OPENWBBASEDIR}/"* "${OPENWBBASEDIR}/")
+	sudo cp -v -p -r "${WORKINGDIR}${OPENWBBASEDIR}/." "${OPENWBBASEDIR}/"
 	echo "****************************************"
 	echo "Step 5: restoring mosquitto db..."
 	if [[ -f "${WORKINGDIR}${MOSQUITTODIR}/mosquitto.db" ]]; then
diff --git a/web/settings/backup.php b/web/settings/backup.php
index d1d0236c3..575eb5f06 100644
--- a/web/settings/backup.php
+++ b/web/settings/backup.php
@@ -1,10 +1,8 @@
 <?php
 	// if parameter extendedFilename is passed with value 1 the filename changes
 	// from backup.tar.gz to openWB_backup_YYYY-MM-DD_HH-MM-SS.tar.gz
-	$useExtendedFilename = 0;
-	if( isset($_GET["extendedFilename"]) && $_GET["extendedFilename"] == "1") {
-		$useExtendedFilename = 1;
-	}
+	$useExtendedFilename = isset($_GET["extendedFilename"]) && $_GET["extendedFilename"] == "1" ? 1 : 0;
+
 	// execute backup script
 	$filename = exec("sudo -u pi " . $_SERVER['DOCUMENT_ROOT'] . "/openWB/runs/backup.sh " . $useExtendedFilename, $output, $result);
 ?>
diff --git a/web/settings/upload.php b/web/settings/upload.php
index 3623b5623..a3dae56c6 100644
--- a/web/settings/upload.php
+++ b/web/settings/upload.php
@@ -139,7 +139,7 @@ function(data){
 		</script>
 		<?php
 			if($uploadOk === true) {
-				exec("sudo -u pi " . $_SERVER['DOCUMENT_ROOT'] . "/openWB/runs/restore.sh");
+				exec("sudo -u pi " . escapeshellarg($_SERVER['DOCUMENT_ROOT']) . "/openWB/runs/restore.sh");
 				?>
 					<script>
 						setTimeout(function() { window.location = "index.php"; }, 15000);