From 85e21d9abb2daf68be31c33dcdbc8874c3cc8fdc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 4 Jan 2000 22:13:57 +0000
Subject: no_comment

---
 perl-install/keyboard.pm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'perl-install/keyboard.pm')

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 0190668af..5d02fdb67 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -179,20 +179,29 @@ sub load($) {
 	 }
 	$count++;
     }
-    log::l("loaded $count keymap tables");
+    #- log::l("loaded $count keymap tables");
 }
 
 sub setup($) {
     my ($keyboard) = @_;
     my $o = $keyboards{$keyboard} or return;
 
-    if (my $file = commands::install_cpio("/usr/share/keymaps", "$o->[1].kmap")) {
-	log::l("loading keymap $o->[1]");
-	load(cat_($file)) if -e $file;
+    log::l("loading keymap $o->[1]");
+    if (-e (my $f = "/usr/share/keymaps/$o->[1].kmap")) {
+	load(cat_($f));
+    } else {
+	local *F;
+	open F, "extract_archive /usr/share/keymaps '' $o->[1].kmap |";
+	local $/ = undef;
+	eval { load(<F>) };
     }
-    if (my $file = commands::install_cpio("/usr/share/xmodmap", "xmodmap.$keyboard")) {
-	eval { run_program::run('xmodmap', $file) } unless $::testing;
+
+    my $f = "/usr/share/xmodmap/xmodmap.$keyboard";
+    if (! -e $f) {
+	run_program::run("extract_archive", "/usr/share/xmodmap", '/tmp', "xmodmap.$keyboard");
+	$f = "/tmp/xmodmap.$keyboard";
     }
+    eval { run_program::run('xmodmap', $f) } unless $::testing;
 }
 
 sub write($$;$) {
-- 
cgit v1.2.1