summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/lang.pm41
2 files changed, 38 insertions, 11 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 82808360c..bc10d0ec9 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-21 Pablo Saratxaga <pablo@mandrakesoft.com>
+
+ * lang.pm: changed the way console font data is written; not all
+ of the [0], [1], [2] values must defined, so three cases must be used.
+ Also added a variable $CHARSET for /etc/sysconfig/i18n; it can then
+ be used by console-tools to load the proper compose table
+
+
2000-06-20 François Pons <fpons@mandrakesoft.com>
* c/sbus.c: added some functions for silo.c integration.
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 601e6c463..9b6639dcb 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -266,18 +266,37 @@ sub write {
add2hash $h, { LANG => $l->[2], LANGUAGE => $l->[3], RPM_INSTALL_LANG => $l->[3] };
my $c = $charsets{$l->[1] || ''};
- if ($c && $c->[0] && $c->[1]) {
- add2hash $h, { SYSFONT => $c->[0], UNIMAP => $c->[1], SYSFONTACM => $c->[2] };
-
+ if ($c) {
my $p = "$prefix/usr/lib/kbd";
- eval {
- commands::cp("-f",
- "$p/consolefonts/$c->[0].psf.gz",
- glob_("$p/consoletrans/$c->[1]*"),
- glob_("$p/consoletrans/$c->[2]*"),
- "$prefix/etc/sysconfig/console");
- };
- $@ and log::l("missing console $c->[0], $c->[1], $c->[2]");
+ add2hash $h, { CHARSET => $c };
+ if ($c->[0]) {
+ add2hash $h, { SYSFONT => $c->[0] };
+ eval {
+ commands::cp("-f",
+ "$p/consolefonts/$c->[0].psf.gz",
+ "$prefix/etc/sysconfig/console");
+ };
+ $@ and log::l("missing console font $c->[0]");
+ }
+ if ($c->[1]) {
+ add2hash $h, { UNIMAP => $c->[1] };
+ eval {
+ commands::cp("-f",
+ glob_("$p/consoletrans/$c->[1]*"),
+ "$prefix/etc/sysconfig/console");
+ };
+ $@ and log::l("missing console unimap file $c->[1]");
+ }
+ if ($c->[2]) {
+ add2hash $h, { SYSFONTACM => $c->[2] };
+ eval {
+ commands::cp("-f",
+ glob_("$p/consoletrans/$c->[2]*"),
+ "$prefix/etc/sysconfig/console");
+ };
+ $@ and log::l("missing console acm file $c->[2]");
+ }
+
}
add2hash $h, $xim{$lang};
}