deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

query-rc learned '-n' to avoid the need to chomp() the result

Browse source
This commit is contained in:
Sitaram Chamarty 2012-03-11 21:45:07 +05:30
parent ef476f0d32
commit 428485086f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Gitolite/Rc.pm
View file

@ -101,7 +101,10 @@ sub glrc {
=for usage =for usage
Usage: gitolite query-rc -a Usage: gitolite query-rc -a
gitolite query-rc <list of rc variables> gitolite query-rc [-n] <list of rc variables>
-a print all variables and values
-n do not append a newline
Example: Example:
@ -115,6 +118,7 @@ Example:
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
my $all = 0; my $all = 0;
my $nonl = 0;
sub query_rc { sub query_rc {
trace( 1, "rc file not found; default should be " . glrc('default-filename') ) if not glrc('filename'); trace( 1, "rc file not found; default should be " . glrc('default-filename') ) if not glrc('filename');
@ -123,14 +127,14 @@ sub query_rc {
no strict 'refs'; no strict 'refs';
if ( $vars[0] eq '-a' ) { if ( $all ) {
for my $e (sort keys %rc) { for my $e (sort keys %rc) {
print "$e=" . ( defined($rc{$e}) ? $rc{$e} : 'undef' ) . "\n"; print "$e=" . ( defined($rc{$e}) ? $rc{$e} : 'undef' ) . "\n";
} }
return; return;
} }
print join( "\t", map { $rc{$_} } @vars ) . "\n" if @vars; print join( "\t", map { $rc{$_} || '' } @vars ) . ($nonl ? '' : "\n") if @vars;
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@ -140,11 +144,11 @@ sub args {
GetOptions( GetOptions(
'all|a' => \$all, 'all|a' => \$all,
'nonl|n' => \$nonl,
'help|h' => \$help, 'help|h' => \$help,
) or usage(); ) or usage();
usage("'-a' cannot be combined with other arguments") if $all and @ARGV; usage("'-a' cannot be combined with other arguments") if $all and @ARGV;
return '-a' if $all;
usage() if not $all and not @ARGV or $help; usage() if not $all and not @ARGV or $help;
return @ARGV; return @ARGV;
} }