From 0f5eeb3e74ae8d053a267c96b0c86881aa1d398c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 14 Oct 2004 07:17:55 +0000 Subject: simplify --- perl-install/services.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/perl-install/services.pm b/perl-install/services.pm index e3d799bf9..1e2a32fc4 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -95,9 +95,8 @@ xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."), if ($s) { $s = translate($s); } else { - $s = -e "$::prefix/etc/rc.d/init.d/$name" && cat_("$::prefix/etc/rc.d/init.d/$name"); - $s ||= -e "$::prefix/etc/init.d/$name" && cat_("$::prefix/etc/init.d/$name"); - $s ||= -e "$::prefix/etc/xinetd.d/$name" && cat_("$::prefix/etc/xinetd.d/$name"); + my $file = find { -e $_ } map { "$::prefix$_/$name" } '/etc/rc.d/init.d', '/etc/init.d', '/etc/xinetd.d'; + $s = cat_($file); $s =~ s/\\\s*\n#\s*//mg; $s = $s =~ /^# description:\s+(.*?)^(?:[^#]|# {0,2}\S)/sm ? $1 : -- cgit v1.2.1