From 7f435a103264bd6a0940a2ca7f6c42a82601a0aa Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 5 Oct 2023 21:00:00 +0200
Subject: [PATCH] data/scripts/backup: don't backup /var/log if it is not a
 directory

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/c3abfa581f46da7be5e7d75481bbc4965e139214
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-10-05 (Thu, 05 Oct 2023)

Origin message was:
------------------
- data/scripts/backup: don't backup /var/log if it is not a directory

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 data/scripts/backup.sh.in       | 9 +++++++--
 data/scripts/backup_flash.sh.in | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/scripts/backup.sh.in b/data/scripts/backup.sh.in
index 476a07808..9ce494317 100644
--- a/data/scripts/backup.sh.in
+++ b/data/scripts/backup.sh.in
@@ -43,7 +43,6 @@ TOBACKUP="\
 	\
 	/var/bin/ \
 	/var/keys/ \
-	/var/log/ \
 	/var/root/ \
 	/var/xupnpd/ \
 	\
@@ -72,8 +71,12 @@ TOBACKUP="\
 	@WEBTVDIR_VAR@/ \
 "
 
-SHOWINFO "backup to ${BAKF} ..."
+# add /var/log if it is a directory
+if [ -d /var/log/ ]; then
+	TOBACKUP="$TOBACKUP /var/log/"
+fi
 
+# add tobackup.conf and its content
 if [ -e "${USRF}" ]; then
 	TOBACKUP="$TOBACKUP ${USRF}"
 	while read i
@@ -81,6 +84,8 @@ if [ -e "${USRF}" ]; then
 		done < $USRF
 fi
 
+SHOWINFO "backup to ${BAKF} ..."
+
 # check existence
 RES=""
 for i in $TOBACKUP
diff --git a/data/scripts/backup_flash.sh.in b/data/scripts/backup_flash.sh.in
index de2dec156..97fa5d3f9 100644
--- a/data/scripts/backup_flash.sh.in
+++ b/data/scripts/backup_flash.sh.in
@@ -9,8 +9,7 @@ BAKF="/var/backup_flash.tar.gz"
 
 TOBACKUP=""
 
-SHOWINFO "backup to ${BAKF} ..."
-
+# add tobackup.conf and its content
 if [ -e "${USRF}" ]; then
 	TOBACKUP="$TOBACKUP ${USRF}"
 	while read i
@@ -18,6 +17,8 @@ if [ -e "${USRF}" ]; then
 		done < $USRF
 fi
 
+SHOWINFO "backup to ${BAKF} ..."
+
 # check existence and skip files in /var
 for i in $TOBACKUP; do
 	if [ -e "$i" -a ${i:0:${#VAR}} != ${VAR} ]; then