From ba2e9575a26cb1c9a81ef5d1303422f862d5e019 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 10 Aug 2003 23:53:18 +0000 Subject: use $::prefix instead of passing $prefix to functions --- perl-install/standalone/adduserdrake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/standalone/adduserdrake') diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index 4bbad2fa3..e5c1fc611 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -9,7 +9,7 @@ use interactive; use any; my @etc_pass_fields = qw(name pw uid gid realname home shell); -my @shells = grep { -x $_ } map { "/bin/$_" } qw(bash tcsh zsh ash ksh); +my @shells = any::shells(); my $isMD5 = cat_("/etc/pam.d/system-auth") =~ /md5/; my $isShadow = cat_("/etc/pam.d/system-auth") =~ /shadow/; @@ -21,13 +21,13 @@ if (my @l = grep { ! /^-/ } @ARGV) { $users = [ map { { name => $_, realname => $_ } } @l ]; } else { $in = 'interactive'->vnew('su'); - any::ask_users('', $in, $users, $ENV{SECURE_LEVEL}); + any::ask_users($in, $users, $ENV{SECURE_LEVEL}); } system("adduser", $_->{name}) foreach @$users; any::write_passwd_user('', $_, $isMD5) foreach @$users; system("pwconv") if $isShadow; -any::addUsers('', $users); +any::addUsers($users); $in->exit(0) if $in; -- cgit v1.2.1