summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-20 10:02:05 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-20 10:02:05 +0000
commit1fb8bac4155dfe2effb0e1b1daddaf34fd39c995 (patch)
treee9193fdf0d0281dab082b838b5566705573df96e
parentabaa2334ba2c5e9ae8bd7205e2607113fa3c732d (diff)
downloaddrakx-1fb8bac4155dfe2effb0e1b1daddaf34fd39c995.tar
drakx-1fb8bac4155dfe2effb0e1b1daddaf34fd39c995.tar.gz
drakx-1fb8bac4155dfe2effb0e1b1daddaf34fd39c995.tar.bz2
drakx-1fb8bac4155dfe2effb0e1b1daddaf34fd39c995.tar.xz
drakx-1fb8bac4155dfe2effb0e1b1daddaf34fd39c995.zip
(chk_empty_xfs_path):
- any { !cdt} equals to every { cdt } - if_ is unneeded (search_dir_font_uninstall) map { if_(cdt, $_ } equals to grep { cdt }
-rwxr-xr-xperl-install/standalone/drakfont4
1 files 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);
}