rendered paste body --- /usr/sbin/drakfont.old 2007-03-30 16:47:50.000000000 +0200
+++ /usr/sbin/drakfont 2007-05-14 11:04:36.000000000 +0200
@@ -199,12 +199,12 @@
}
sub search_windows_font() {
- foreach my $fstab_line (grep { /vfat|smbfs|ntfs/ } cat_('/etc/mtab')) {
+ foreach my $fstab_line (grep { /vfat|smbfs|ntfs|fuse/ } cat_('/etc/mtab')) {
my $win_dir = (split('\s', $fstab_line))[1];
- my @list_fonts_win = all("$win_dir/windows/fonts");
+ my @list_fonts_win = all("$win_dir/WINDOWS/Fonts");
my @list_fonts_winnt = all("$win_dir/winnt/fonts");
my $nb_dir = @list_fonts_win + @list_fonts_winnt;
- foreach ([ \@list_fonts_win, "windows" ],
+ foreach ([ \@list_fonts_win, "WINDOWS" ],
[ \@list_fonts_winnt, "winnt" ]) {
foreach my $i (@{ $_->[0] }) {
if ($interactive) {
@@ -216,7 +216,7 @@
}
}
!$replace && any { /$i/ } @installed_fonts and next;
- any { /$i$/ } @font_list or push @font_list, "$win_dir/$_->[1]/fonts/$i";
+ any { /$i$/ } @font_list or push @font_list, "$win_dir/$_->[1]/Fonts/$i";
}
}
$interactive && $nb_dir and progress($pbar, 1, N("done"));