corrected ttf/TTF and xfs restart

1 files changed, 5 insertions, 3 deletions

diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d6674fe1b..e808f625e 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -240,12 +240,12 @@ sub search_installed_fonts_full_path {
 }
 
 sub search_windows_font {
-    foreach my $fstab_line (grep { /vfat/ } cat_('/etc/mtab') ) {
+    foreach my $fstab_line (grep { /vfat|ntfs/ } cat_('/etc/mtab') ) {
 	my $win_dir = (split('\s', $fstab_line))[1];
 	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"], [\@list_fonts_winnt, "winnt"]) {
+	foreach ([\@list_fonts_win, "windows"], [\@list_fonts_winnt, "winnt"]) {
 	    foreach my $i (@{$_->[0]}) {
 		if($interactive) {
 		    if($nb_dir) { progress($pbar, 0.25/$nb_dir, _("parse all fonts")) } else {
@@ -351,7 +351,8 @@ sub put_font_dir {
 	$interactive and progress($pbar1, 0.01, _("done"));
 	$interactive and progress($pbar2, 0.10, _("True Type fonts installation"));
   
-	system ("cd $drakfont_dir/tmp/tmp   && cp *.ttf ../../ttf");
+	system ("cd $drakfont_dir/tmp/tmp ; for i in *.TTF; do mv -f $i `basename $i .TTF`.ttf; done");
+	system ("cd $drakfont_dir/tmp/tmp  && cp *.ttf ../../ttf");
 	$interactive and progress($pbar2, 0.20, _("please wait during ttmkfdir..."));
 	system ("cd $drakfont_dir/ttf && $ttmkfdir > fonts.dir" );
 	$interactive and progress($pbar2, 0.10, _("True Type install done"));
@@ -411,6 +412,7 @@ sub put_font_dir {
 	print "\n\nretarting xfs......\n";
 	$interactive and  progress($pbar3, 0.5 , _("Restart XFS"));
 	system ($restart_xfs);
+	system('kill -USR1 `/sbin/pidof xfs` 2&1>/dev/null');
 	$interactive and  progress($pbar3, 0.30, _("done"));
     }
 }