diff options
author | Joe Rayhawk <jrayhawk+piny.be@omgwallhack.org> | 2009-10-21 17:49:10 -0700 |
---|---|---|
committer | Joe Rayhawk <jrayhawk+piny.be@omgwallhack.org> | 2009-10-21 17:49:10 -0700 |
commit | a24383e2b312f697e1665c656e2208f6ba42ba15 (patch) | |
tree | b0f1c2e651fc4bb523ffed750f85598dafdf056a /usr/local | |
parent | 9b531adbcaa807a352d14b68b70ed125e285d056 (diff) | |
download | piny-code-a24383e2b312f697e1665c656e2208f6ba42ba15.tar.gz piny-code-a24383e2b312f697e1665c656e2208f6ba42ba15.zip |
Remove support for periods in reponames since they cause problems.
Diffstat (limited to 'usr/local')
-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 07cc893..8d5e8f1 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 (+) and minus (-) signs, and periods (.).\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, 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 8cee460..73cf68e 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 (+) and minus (-) signs, and periods (.).\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, 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 2f7e06e..4d5d8d6 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 (+) and minus (-) signs, and periods (.).\n" ); + print( " REPONAME must consist only of lower case letters (a-z), digits (0-9), plus (+) signs, 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 5c67339..ad84e1b 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 { |