From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] backup: Fix broken globbing expansion
Date: Tue, 29 Mar 2022 15:10:12 +0200
Message-ID: <1e9b7f29-a3ef-92f1-7644-41c2c71ab1c9@ipfire.org>
In-Reply-To: <20220329122711.558230-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0701993997987263480=="
List-Id: <development.lists.ipfire.org>

--===============0701993997987263480==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Michael,

Just tried this patch out on my vm testbed system and it still doesn't work f=
or 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 aroun=
d 7MB

The above was the case for both running it from the WUI or from the command l=
ine 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 @@
>   #                                                                        =
     #
>   #########################################################################=
######
>  =20
> +shopt -s nullglob
> +
>   NOW=3D"$(date "+%Y-%m-%d-%H:%M")"
>  =20
>   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

--===============0701993997987263480==--