From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Fix for bug 12539
Date: Thu, 10 Dec 2020 13:48:20 +0100
Message-ID: <6C2C431A-0598-476D-BDC8-460D791BCA9A@ipfire.org>
In-Reply-To: <20201207140136.3423-1-ahb.ipfire@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5154879494441358299=="
List-Id: <development.lists.ipfire.org>

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

Hello,

Great work. This looks like how it should be.

> On 7 Dec 2020, at 15:01, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>=20
> The installer recognises cups and cups-filters both as cups and puts
> two instances of cups in the add-on services table.
> Based on input from Michael Tremer this patch replaces the command
> returning the second element between hyphens with one that takes
> what comes after "meta-" using Perl code rather than a shell command.
> The second find command was changed as per Michael's suggestion.
>=20
> Tested in my ipfire test bed system and only results in one cups
> entry.
> Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
> ---
> html/cgi-bin/services.cgi | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>=20
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index 26ab4f314..36954ba70 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -161,19 +161,20 @@ END
> 	my $lines=3D0; # Used to count the outputlines to make different bgcolor
>=20
> 	# Generate list of installed addon pak's
> -	my @pak =3D `find /opt/pakfire/db/installed/meta-* 2>/dev/null | cut -d"-=
" -f2`;
> +	opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pa=
kfire/db/installed/: $!";
> +	my @pak =3D sort readdir DIR;
> 	foreach (@pak){
> 		chomp($_);
> +		next unless (m/^meta-/);
> +		s/^meta-//;

Although this is the least intuitive thing to do. I have no idea who designed=
 Perl. I hope they are proud of all the chaos they have created :)

-Michael

>=20
> 		# Check which of the paks are services
> -		my @svc =3D `find /etc/init.d/$_ 2>/dev/null | cut -d"/" -f4`;
> -		foreach (@svc){
> +		if (-e "/etc/init.d/$_") {
> 			# blacklist some packages
> 			#
> 			# alsa has trouble with the volume saving and was not really stopped
> 			# mdadm should not stopped with webif because this could crash the system
> 			#
> -			chomp($_);
> 			if ( $_ eq 'squid' ) {
> 				next;
> 			}
> --=20
> 2.29.2
>=20


--===============5154879494441358299==--