summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-04 22:41:30 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-04 22:41:30 +0000
commit5390c9097902ff5420848efb72edcb2cbf81ca04 (patch)
tree5f66cfd05433671518d81901ec06b25cf93116a9 /perl-install
parented0859891e951a8e73e099b1d8cd8a84d528d3ef (diff)
downloaddrakx-5390c9097902ff5420848efb72edcb2cbf81ca04.tar
drakx-5390c9097902ff5420848efb72edcb2cbf81ca04.tar.gz
drakx-5390c9097902ff5420848efb72edcb2cbf81ca04.tar.bz2
drakx-5390c9097902ff5420848efb72edcb2cbf81ca04.tar.xz
drakx-5390c9097902ff5420848efb72edcb2cbf81ca04.zip
(search_windows_font) try different cases on windows partitions (based on ffixxx suggestion, #28016)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont7
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a189efb36..c2a12d22d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,7 @@
o when formatting ntfs don't zero partition (#30928)
- drakfont:
o do see fuse-mounted or ntfs-3g windows partitions (ffixxx, #28016)
+ o try different cases on windows partitions (based on ffixxx suggestion, #28016)
- drakhelp:
o fix .mozilla dir as root when it doesn't exists (#29775)
- draksec:
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 177070d07..d1277f71d 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -201,10 +201,11 @@ sub search_installed_fonts_full_path() {
sub search_windows_font() {
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"), 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" ],
+ [ \@list_fonts_win, "WINDOWS" ],
[ \@list_fonts_winnt, "winnt" ]) {
foreach my $i (@{ $_->[0] }) {
if ($interactive) {
@@ -216,7 +217,9 @@ sub search_windows_font() {
}
}
!$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,
+ find { -e $_ } map { "$win_dir/$_->[1]/fonts/$_",
+ "$win_dir/$_->[1]/Fonts/$_" } $i;
}
}
$interactive && $nb_dir and progress($pbar, 1, N("done"));