From 1fb8bac4155dfe2effb0e1b1daddaf34fd39c995 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 20 May 2003 10:02:05 +0000 Subject: (chk_empty_xfs_path): - any { !cdt} equals to every { cdt } - if_ is unneeded (search_dir_font_uninstall) map { if_(cdt, $_ } equals to grep { cdt } --- perl-install/standalone/drakfont | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 4c8a6ae09..21b1853b5 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -191,7 +191,7 @@ sub list_fontpath() { sub chk_empty_xfs_path() { foreach my $tmp_path (@installed_fonts_path) { - if (!(any { if_(!(/^fonts/ || /^type/), $_) } all($tmp_path))) { + if (every { /^fonts/ || /^type/ } all($tmp_path))) { system("chkfontpath -r $tmp_path ") or print "PERL::system command failed during chkfontpath\n"; } @@ -286,7 +286,7 @@ sub search_dir_font_uninstall { my ($fn) = @_; my @font_list_tmp; if (-d $fn) { - @font_list_tmp = map { if_(is_a_font($_), $_) } all($fn); + @font_list_tmp = grep { is_a_font($_) } all($fn); } else { push @font_list_tmp, $fn if is_a_font($fn); } -- cgit v1.2.1