From fbed47ae1a94f3f0e0fc2bd2ef74cc7df79055b5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 14 Oct 2004 07:14:30 +0000
Subject: simplify

---
 perl-install/services.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'perl-install/services.pm')

diff --git a/perl-install/services.pm b/perl-install/services.pm
index 581f5fc92..e3d799bf9 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -99,11 +99,10 @@ xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."),
 	$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");
 	$s =~ s/\\\s*\n#\s*//mg;
-	if ($s =~ /^# description:\s+\S/sm) {
-	    ($s) = $s =~ /^# description:\s+(.*?)^(?:[^#]|# {0,2}\S)/sm;
-	} else {
-	    ($s) = $s =~ /^#\s*(.*?)^[^#]/sm;
-	}
+	$s = 
+	  $s =~ /^# description:\s+(.*?)^(?:[^#]|# {0,2}\S)/sm ? $1 :
+	  $s =~ /^#\s*(.*?)^[^#]/sm ? $1 : '';
+
 	$s =~ s/#\s*//mg;
     }
     $s =~ s/\n/ /gm; $s =~ s/\s+$//;
-- 
cgit v1.2.1