From 4ac0fd01b73a0b718db3a756866fee121a1615f1 Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Sun, 24 Apr 2011 12:57:38 -0700 Subject: Switching ikiwiki- username/group over to iki-; untested and requires a mass rebuildrepo --- pinyadmin/sbin/newuser | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pinyadmin/sbin') diff --git a/pinyadmin/sbin/newuser b/pinyadmin/sbin/newuser index e38e791..c463aa9 100755 --- a/pinyadmin/sbin/newuser +++ b/pinyadmin/sbin/newuser @@ -73,8 +73,8 @@ if ( scalar @ARGV == 3 and $ARGV[0] eq "--batch" ) { next; }; - if ( $username =~ /^(git|ikiwiki)-/ ) { - print "Your username cannot start with git- or ikiwiki-!\n"; + if ( $username =~ /^(git|iki)-/ ) { + print "Your username cannot start with git- or iki-!\n"; next; }; @@ -117,7 +117,7 @@ if ( scalar @ARGV == 3 and $ARGV[0] eq "--batch" ) { # pathways to get to this point, but only a single path from here on down. if ( not defined $email or $email eq "" ) { print "Email address is undefined!\n"; exit 3; }; if ( not defined $username or $username eq "" ) { print "Username is undefined!\n"; exit 3; }; -if ( $username =~ /^(git|ikiwiki)-/ ) { print "Username must not begin with git- or ikiwiki-!\n"; exit 3; }; +if ( $username =~ /^(git|iki)-/ ) { print "Username must not begin with git- or iki-!\n"; exit 3; }; if ( $username !~ /^[a-zA-Z0-9_.][a-zA-Z0-9_.-]+$/ ) { print "Usernames must consist only of letters, digits, underscores, periods, and dashes, and not start with a dash. Usernames are case sensitive.\n" }; if ( not defined $password or $password eq "" ) { print "Password is undefined!\n"; exit 3; }; -- cgit v1.2.3