From c3640b88aed5689eb4b598f9733baa724da7f15e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 23 Sep 2003 21:15:39 +0000
Subject: fix font copy (catched by #5157): - prevent looking for "*.pfm*.afm"
 fonts - prevent displaying spurious error messages on console while  
 converting fonts

---
 perl-install/standalone/drakfont | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 70a973f45..1143f7c33 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -346,7 +346,8 @@ sub put_font_dir() {
 
         if ($gs) {
             convert_ttf_fonts([ glob("$drakfont_dir/tmp/tmp/*.ttf") ], 1);
-            system(join('', "cd $drakfont_dir/tmp/tmp && mv *.gsf *.pfb *.pfm", if_($so, "*.afm"), " ../Type1"));
+            my @fonts = map { s@.*/@@; $_ } map { glob("$drakfont_dir/tmp/tmp/*.$_") } qw(gsf pfb pfm afm); 
+            system("cd $drakfont_dir/tmp/tmp && mv @fonts ../Type1") if @fonts;
             system("cd $drakfont_dir/tmp/Type1 && $type1inst");
             interactive_progress($pbar2, 0.1, N("type1inst building"));
             if ($so) {
-- 
cgit v1.2.1