From f9dcc0606f123dc3f29d0662060f2d2736037994 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Jun 2007 23:17:56 +0000 Subject: (search_windows_font) do not misbelieve a font is already installed if substring of another font name (eg "l.ttf" wouldn't be installed if "arial.ttf" was) --- perl-install/NEWS | 3 +++ perl-install/standalone/drakfont | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index c7eb1c46f..aa38252ef 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,8 @@ - interactive layer: o enable to override default size with Gtk+ frontend +- drakfont: + o do not misbelieve a font is already installed if substring of + another font name Version 10.4.134 - 06 June 2007, by Thierry Vignaud diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 160be714d..8fa77617e 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -216,9 +216,9 @@ sub search_windows_font() { return 0; } } - !$replace && any { /$i/ } @installed_fonts and next; + !$replace && any { /^$i$/ } @installed_fonts and next; my $subdir = $_->[1]; - any { /$i$/ } @font_list or push @font_list, + any { /^$i$/ } @font_list or push @font_list, grep { -e $_ } map { ("$win_dir/$subdir/fonts/$_", "$win_dir/$subdir/Fonts/$_") } $i; } -- cgit v1.2.1