diff -r eea8bbbf3818 -r 2b8cf6a91d0b bin/ius-dav-htuserdel --- a/bin/ius-dav-htuserdel Fri Jul 22 09:38:29 2011 +0200 +++ b/bin/ius-dav-htuserdel Fri Sep 06 13:56:57 2013 +0200 @@ -21,15 +21,15 @@ use warnings; use Getopt::Long; -use Ius::Dav::Htpasswd qw(readconfig userdel usage); +use Ius::Dav::Htpasswd; my $user; GetOptions( 'u|user=s' => \$user, - "h|help" => sub { usage( -verbose => 0, -exitval => 0 ) }, + "h|help" => sub { Ius::Dav::Htpasswd::usage( -verbose => 0, -exitval => 0 ) }, "m|man" => sub { - usage( + Ius::Dav::Htpasswd::usage( -verbose => 2, -exitval => 0, -noperldoc => ( `perldoc -V 2>/dev/null`, $? != 0 )[-1] @@ -37,6 +37,8 @@ }, ) and defined $user - or usage(); + or Ius::Dav::Htpasswd::usage(); -exit userdel readconfig, $user; +my $h = Ius::Dav::Htpasswd->new; +$h->readconfig or die "Can't readconfig"; +exit $h->userdel($user);