summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-05 18:47:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-05 18:47:04 +0000
commit91343865fe27657fe9e298cdcaddc24536b79743 (patch)
tree36c101e56a85835e5b1bd11f522677567323a3f6
parent969bc065596476bce5cfed0bb7ffd263f48eb1d5 (diff)
downloaddrakx-backup-do-not-use-91343865fe27657fe9e298cdcaddc24536b79743.tar
drakx-backup-do-not-use-91343865fe27657fe9e298cdcaddc24536b79743.tar.gz
drakx-backup-do-not-use-91343865fe27657fe9e298cdcaddc24536b79743.tar.bz2
drakx-backup-do-not-use-91343865fe27657fe9e298cdcaddc24536b79743.tar.xz
drakx-backup-do-not-use-91343865fe27657fe9e298cdcaddc24536b79743.zip
no_comment
-rw-r--r--perl-install/install_steps.pm43
1 files changed, 22 insertions, 21 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0ea5c2be4..bba158389 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -387,27 +387,28 @@ Consoles 1,3,4,7 may also contain interesting information";
}
}
- my $hasttf;
- my $dest = "/usr/X11R6/lib/X11/fonts/drakfont";
- foreach my $d (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) {
- foreach my $D (map { "$d/$_" } grep { m|^win|i } all("$o->{prefix}$d")) {
- $D .= "/fonts";
- -d "$o->{prefix}$D" or next;
- log::l("found win font dir $D");
- if (!$hasttf) {
- $hasttf = $o->ask_okcancel('',
-_("Some true type fonts from windows have been found on your computer.
-Do you want to use them? Be sure you have the right to use them under Linux."), 1) or goto nottf;
- mkdir "$o->{prefix}$dest", 0755;
- }
- /(.*)\.ttf/i and symlink "$D/$_", "$o->{prefix}$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D");
- }
- }
- nottf:
- if ($hasttf) {
- run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir");
- run_program::rooted($o->{prefix}, "chkfontpath", "--add", $dest);
- }
+#- my $hasttf;
+#- my $dest = "/usr/X11R6/lib/X11/fonts/drakfont";
+#- foreach my $d (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) {
+#- foreach my $D (map { "$d/$_" } grep { m|^win|i } all("$o->{prefix}$d")) {
+#- $D .= "/fonts";
+#- -d "$o->{prefix}$D" or next;
+#- log::l("found win font dir $D");
+#- if (!$hasttf) {
+#- $hasttf = $o->ask_okcancel('',
+#-_("Some true type fonts from windows have been found on your computer.
+#-Do you want to use them? Be sure you have the right to use them under Linux."), 1) or goto nottf;
+#- mkdir "$o->{prefix}$dest", 0755;
+#- }
+#- /(.*)\.ttf/i and symlink "$D/$_", "$o->{prefix}$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D");
+#- }
+#- }
+#- nottf:
+#- if ($hasttf) {
+#- run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir");
+#- run_program::rooted($o->{prefix}, "chkfontpath", "--add", $dest);
+#- }
+
foreach (install_any::list_skels()) {
my $found;
substInFile {