[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f10c0b3a3a3441f352ff10d1a46c702a93f84f4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f10c0b3a3a3441f352ff10d1a46c702a93f84f4

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4f10c0b3a3a3441f352ff10d1a46c702a93f84f4 (commit)
      from  a4e5b80b91132e324e8c1caee1abb2e43a8ee706 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f10c0b3a3a3441f352ff10d1a46c702a93f84f4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 1 10:27:09 2018 +0000

    backup: Fix expanding glogging
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/backup.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index ddf2bf2b1..3accbcfff 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -38,11 +38,11 @@ process_includes() {
 	for include in $@; do
 		local file
 		while read -r file; do
-			while read file; do
+			for file in ${file}; do
 				if [ -e "${file}" ]; then
 					echo "${file}"
 				fi
-			done <<< ${file}
+			done
 		done < "${include}"
 	done | sort -u
 }
@@ -201,6 +201,10 @@ main() {
 			mkdir -p /var/ipfire/backup/addons/{backup,includes}
 			;;
 
+		list)
+			process_includes "/var/ipfire/backup/include" "/var/ipfire/backup/include.user"
+			;;
+
 		/var/ipfire/backup/*.ipf|/var/ipfire/backup/addons/backup/*.ipf|/var/tmp/backupiso/*.iso)
 			unlink "${command}"
 			;;


hooks/post-receive
--
IPFire 2.x development tree