diff options
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/XFdrake | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/adduserdrake | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/keyboarddrake | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 072f770a1..fd6940c1b 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -43,7 +43,7 @@ my $f = "/usr/X11R6/lib/X11/Cards"; -e $f or system("urpmi --auto XFree86 XFree86-75dpi-fonts"); -e $f or die "install XFree86 first!\n"; -my $in = vnew interactive('su'); +my $in = interactive->vnew('su'); `pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start"); diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index 6cd88bf32..4bcd57f91 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -1,6 +1,6 @@ #!/usr/bin/perl -use lib qw(/usr/lib/libDrakX); +use lib ".";# qw(/usr/lib/libDrakX); use common qw(:common :functional :system :file); use interactive; @@ -44,7 +44,7 @@ if ($in->ask_from_entries_refH( ), $::beginner ? () : ( _("Shell") => {val => \$u->{shell}, list => \@shells, not_edit => !$::expert} ), $security > 3 ? () : ( - _("Icon") => {val => \$u->{icon}, list => [ map { translate($_) } @any::users ], not_edit => 1 }, + _("Icon") => {val => \$u->{icon}, list => [ @any::users ], icon2f => \&any::icon2file }, ), ], focus_out => sub { @@ -58,7 +58,7 @@ if ($in->ask_from_entries_refH( $u->{name} or $in->ask_warn('', _("Please give a user name")), return (1,0); $u->{name} =~ /^[a-z0-9_-]+$/ or $in->ask_warn('', _("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0); member($u->{name}, map { $_->{name} } @users) and $in->ask_warn('', _("This user name is already added")), return (1,0); - $u->{icon} = untranslate($u->{icon}, @any::users); + print $u->{icon}, "\n"; return 0; }, )) { diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index 016202c68..004b135b6 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -16,13 +16,13 @@ local $_ = join '', @ARGV; $::expert = /-expert/; $::isStandalone = 1; -my $in = vnew interactive('su'); +my $in = interactive->vnew('su'); -my $keyboard = keyboard::text2keyboard( - $in->ask_from_list_(_("Keyboard"), - _("What is your keyboard layout?"), - [ keyboard::list() ], - keyboard::keyboard2text(keyboard::read('')))); +my $keyboard = $o->ask_from_listf_(_("Keyboard"), + _("Please, choose your keyboard layout."), + \&keyboard::keyboard2text, + [ keyboard::xmodmaps() ], + keyboard::read()); my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", "Do you want the BackSpace to return Delete in console?", 1); |