Re: [PATCH] backup: Fix broken globbing expansion

[Michael Tremer <michael.tremer@ipfire.org>]

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

Hello,

Could you please send the file listing to find out what is being included what shouldn’t?

-Michael

> On 29 Mar 2022, at 14:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi Michael,
> 
> Just tried this patch out on my vm testbed system and it still doesn't work for me. The backup file had got to 1.3GB when I deleted the backup file as it was still growing. The normal correct backup file on that vm machine is around 7MB
> 
> The above was the case for both running it from the WUI or from the command line from my unprivileged user using sudo backupctrl exclude
> 
> Regards,
> 
> Adolf.
> 
> 
> On 29/03/2022 14:27, Michael Tremer wrote:
>> This patch fixes globbing expansion in the backup include file list
>> which got broken in c7e0d73e7cfd7be95db9d0a5f3392b8241813d5b.
>> 
>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>> ---
>>  config/backup/backup.pl | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>> 
>> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
>> index a2337cf23..6f9295e94 100644
>> --- a/config/backup/backup.pl
>> +++ b/config/backup/backup.pl
>> @@ -19,6 +19,8 @@
>>  #                                                                             #
>>  ###############################################################################
>>  +shopt -s nullglob
>> +
>>  NOW="$(date "+%Y-%m-%d-%H:%M")"
>>    list_addons() {
>> @@ -38,10 +40,8 @@ process_includes() {
>>  	for include in $@; do
>>  		local file
>>  		while read -r file; do
>> -			for file in ${file}; do
>> -				if [ -e "/${file}" ]; then
>> -					echo "${file}"
>> -				fi
>> +			for file in /${file}; do
>> +				echo "${file}"
>>  			done
>>  		done < "${include}"
>>  	done | sort -u