summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-09-23 21:15:39 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-09-23 21:15:39 +0000
commitc3640b88aed5689eb4b598f9733baa724da7f15e (patch)
treed2925440f6ee8cd597082fa5cd44cee2e88d5968 /perl-install/standalone
parent2b3906a44318526b1acc5971a83df422d19c0913 (diff)
downloaddrakx-backup-do-not-use-c3640b88aed5689eb4b598f9733baa724da7f15e.tar
drakx-backup-do-not-use-c3640b88aed5689eb4b598f9733baa724da7f15e.tar.gz
drakx-backup-do-not-use-c3640b88aed5689eb4b598f9733baa724da7f15e.tar.bz2
drakx-backup-do-not-use-c3640b88aed5689eb4b598f9733baa724da7f15e.tar.xz
drakx-backup-do-not-use-c3640b88aed5689eb4b598f9733baa724da7f15e.zip
fix font copy (catched by #5157):
- prevent looking for "*.pfm*.afm" fonts - prevent displaying spurious error messages on console while converting fonts
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakfont3
1 files changed, 2 insertions, 1 deletions
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) {