diff options
| -rwxr-xr-x | usr/local/sbin/addaccess | 4 | ||||
| -rwxr-xr-x | usr/local/sbin/newrepo | 4 | ||||
| -rwxr-xr-x | usr/local/sbin/rmaccess | 4 | ||||
| -rwxr-xr-x | usr/local/sbin/rmrepo | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/usr/local/sbin/addaccess b/usr/local/sbin/addaccess index 8d5e8f1..b1b2916 100755 --- a/usr/local/sbin/addaccess +++ b/usr/local/sbin/addaccess @@ -8,10 +8,10 @@ my( $reponame, $uid, $gitowner); if ( ( ! scalar $ARGV[1] ) or ( scalar $ARGV[2] ) ) { # must have exactly two arguments print( "Usage: addaccess USER REPONAME\n" ); exit( 1 ); -} elsif ( ( $ARGV[0] !~ /^[a-zA-Z0-9_.][a-zA-Z0-9_.-]+$/ ) or ( $ARGV[1] !~ /^[a-z0-9][a-z0-9+-]+$/ ) ) { # Extra paranoid sanity checking +} elsif ( ( $ARGV[0] !~ /^[a-zA-Z0-9_.][a-zA-Z0-9_.-]+$/ ) or ( $ARGV[1] !~ /^[a-z0-9][a-z0-9-]+$/ ) ) { # Extra paranoid sanity checking print( "Usage: addaccess USER REPONAME\n" ); print( " USER must consist only of letters, digits, underscores, periods, and dashes, and not start with a dash.\n" ); - print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, and minus (-) signs.\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), and minus (-) signs.\n" ); print( " REPONAME must be at least two characters long and must start with an alphanumeric character.\n" ); exit( 1 ); } else { diff --git a/usr/local/sbin/newrepo b/usr/local/sbin/newrepo index 73cf68e..15bbde6 100755 --- a/usr/local/sbin/newrepo +++ b/usr/local/sbin/newrepo @@ -6,9 +6,9 @@ use warnings; my( $errorto ) = 'jrayhawk+piny.be@omgwallhack.org'; # Email address to send horrible errors to. my( $reponame, $email, @errors, $wikilisttempfile, $cgitrctempfile, $description ); -if ( ( ! scalar $ARGV[0] ) or ( scalar $ARGV[1] ) or ( $ARGV[0] !~ /^[a-z0-9][a-z0-9+-]+$/ ) ) { +if ( ( ! scalar $ARGV[0] ) or ( scalar $ARGV[1] ) or ( $ARGV[0] !~ /^[a-z0-9][a-z0-9-]+$/ ) ) { print( "Usage: newrepo REPONAME\n" ); - print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, and minus (-) signs.\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), and minus (-) signs.\n" ); print( " REPONAME must be at least two characters long and must start with an alphanumeric character.\n" ); exit( 1 ); } else { diff --git a/usr/local/sbin/rmaccess b/usr/local/sbin/rmaccess index 4d5d8d6..06b4f07 100755 --- a/usr/local/sbin/rmaccess +++ b/usr/local/sbin/rmaccess @@ -8,10 +8,10 @@ my( $reponame, $uid, $gitowner); if ( ( ! scalar $ARGV[1] ) or ( scalar $ARGV[2] ) ) { # must have exactly two arguments print( "Usage: rmaccess USER REPONAME\n" ); exit( 1 ); -} elsif ( ( $ARGV[0] !~ /^[a-zA-Z0-9_.][a-zA-Z0-9_.-]+$/ ) or ( $ARGV[1] !~ /^[a-z0-9][a-z0-9+-]+$/ ) ) { # Extra paranoid sanity checking +} elsif ( ( $ARGV[0] !~ /^[a-zA-Z0-9_.][a-zA-Z0-9_.-]+$/ ) or ( $ARGV[1] !~ /^[a-z0-9][a-z0-9-]+$/ ) ) { # Extra paranoid sanity checking print( "Usage: rmaccess USER REPONAME\n" ); print( " USER must consist only of letters, digits, underscores, periods, and dashes, and not start with a dash.\n"); - print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, and minus (-) signs.\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), and minus (-) signs.\n" ); print( " REPONAME must be at least two characters long and must start with an alphanumeric character.\n" ); exit( 1 ); } else { diff --git a/usr/local/sbin/rmrepo b/usr/local/sbin/rmrepo index ad84e1b..864830f 100755 --- a/usr/local/sbin/rmrepo +++ b/usr/local/sbin/rmrepo @@ -5,7 +5,7 @@ use warnings; my( $reponame, $uid, $gitowner, $wikilisttempfile, $cgitrctempfile); -if ( ( ! scalar $ARGV[0] ) or ( scalar $ARGV[1] ) or ( $ARGV[0] !~ /^[a-z0-9][a-z0-9+-]+$/ ) ) { +if ( ( ! scalar $ARGV[0] ) or ( scalar $ARGV[1] ) or ( $ARGV[0] !~ /^[a-z0-9][a-z0-9-]+$/ ) ) { print( "Usage: rmrepo REPONAME\n" ); exit( 1 ); } else { |