move empty ARGV check down after "-s" check

to make calling "gl-auth -s" (no username) work
This commit is contained in:
Sitaram Chamarty 2010-07-21 06:27:43 +05:30
parent 20c2e1aac8
commit bdb7cd6903

View file

@ -58,18 +58,18 @@ my $repo_base_abs = $ENV{GL_REPO_BASE_ABS} = ( $REPO_BASE =~ m(^/) ? $REPO_BASE
# start... # start...
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# no arguments given? default user is $USER (fedorahosted works like this,
# and it is harmless for others)
@ARGV = ($ENV{USER}) unless @ARGV;
# if the first argument is a "-s", this user is allowed to get a shell using # if the first argument is a "-s", this user is allowed to get a shell using
# this key # this key
my $shell_allowed = 0; my $shell_allowed = 0;
if ($ARGV[0] eq '-s') { if (@ARGV and $ARGV[0] eq '-s') {
$shell_allowed = 1; $shell_allowed = 1;
shift; shift;
} }
# no (more) arguments given? default user is $USER (fedorahosted works like
# this, and it is harmless for others)
@ARGV = ($ENV{USER}) unless @ARGV;
# first, fix the biggest gripe I have with gitosis, a 1-line change # first, fix the biggest gripe I have with gitosis, a 1-line change
my $user=$ENV{GL_USER}=shift; # there; now that's available everywhere! my $user=$ENV{GL_USER}=shift; # there; now that's available everywhere!