summaryrefslogtreecommitdiffstats
path: root/perl-install/keyboard.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-10 09:15:24 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-10 09:15:24 +0000
commitfd82c0312a315599fb0d766fa5c6b7be4b211ba3 (patch)
treed7a1e782db5b8b42cd9d4f5795d3da0b92871773 /perl-install/keyboard.pm
parent1cfe6c79ba71ee10522049af62e959b79cd7c9ed (diff)
downloaddrakx-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar
drakx-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.gz
drakx-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.bz2
drakx-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.tar.xz
drakx-fd82c0312a315599fb0d766fa5c6b7be4b211ba3.zip
no_comment
Diffstat (limited to 'perl-install/keyboard.pm')
-rw-r--r--perl-install/keyboard.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index baad33b74..fdd821465 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -9,6 +9,7 @@ use strict;
#-######################################################################################
use common qw(:common :system :file);
use run_program;
+use install_any;
use log;
use c;
@@ -116,12 +117,13 @@ sub setup($) {
my ($keyboard) = @_;
my $o = $keyboards{$keyboard} or return;
- my $file = "/usr/share/keymaps/$o->[1].kmap";
- if (-e $file) {
+ if (my $file = install_any::install_cpio("/usr/share/keymaps", "$o->[1].kmap")) {
log::l("loading keymap $o->[1]");
load(cat_($file));
}
- eval { run_program::run('xmodmap', "/usr/share/xmodmap/xmodmap.$o->[2]") } unless $::testing;
+ if (my $file = install_any::install_cpio("/usr/share/xmodmap", "xmodmap.$o->[2]")) {
+ eval { run_program::run('xmodmap', $file) } unless $::testing;
+ }
}
sub write($$) {