summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/keyboarddrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-15 17:05:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-15 17:05:18 +0000
commit582cc9a731459f6069e218f750eaa414ff587baf (patch)
tree8e6745e7054e084b04414804a56e78de98228562 /perl-install/standalone/keyboarddrake
parentfe791a2b227213568a101d9aae4b78f606a27dcd (diff)
downloaddrakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar
drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.gz
drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.bz2
drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.tar.xz
drakx-backup-do-not-use-582cc9a731459f6069e218f750eaa414ff587baf.zip
fix XkbOptions handling
Diffstat (limited to 'perl-install/standalone/keyboarddrake')
-rwxr-xr-xperl-install/standalone/keyboarddrake12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 59118baae..a6c415c7e 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -36,10 +36,10 @@ if ($keyboard) {
my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1);
my $kmap = keyboard::keyboard2kmap($keyboard);
- `loadkeys $kmap`;
+ system('loadkeys', $kmap);
my $xkb = keyboard::keyboard2xkb($keyboard);
- `setxkbmap $xkb`;
+ system('setxkbmap', $xkb);
my $f = "/etc/X11/XF86Config";
my $g = "/etc/X11/XF86Config-4";
@@ -47,16 +47,16 @@ if ($keyboard) {
substInFile {
if (/^Section\s+"Keyboard"/ .. /^EndSection/) {
s|^(\s*XkbLayout\s+).*|$1"$xkb"|
- and $_ .= join '', map { " $_\n" } @{$xkb_options{$xkb} || []};
- s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one
+ and $_ .= join '', map { " $_\n" } @{$Xconfigurator::xkb_options{$xkb} || []};
+ $_ = '' if m,^(\s*(XkbVariant|XkbOptions)\s+),; # remove existing one
}
} $f if -e $f && !$::testing;
substInFile {
if (/Identifier\s+"Keyboard1"/ .. /^EndSection/) {
s|^(\s*Option\s+"XkbLayout"\s+).*|$1"$xkb"|
- and $_ .= join '', map { /(\S+)(.*)/; qq( Option "$1" $2\n) } @{$xkb_options{$xkb} || []};
- s,^(\s*Option\s+"(XkbVariant|XkbOptions)"\s+).*,,; # remove existing one
+ and $_ .= join '', map { /(\S+)(.*)/; qq( Option "$1" $2\n) } @{$Xconfigurator::xkb_options{$xkb} || []};
+ $_ = '' if m,^(\s*Option\s+"(XkbVariant|XkbOptions)"\s+),; # remove existing one
}
} $g if -e $g && !$::testing;