treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / script / public-inbox-index

diff --git a/script/public-inbox-index b/script/public-inbox-index
index c0d637b109d886ecdd2c89424bf1cb488d3aa8d1..2c7c4f13dfc13a14d400106cb3dcaa0f217353d0 100755 (executable)
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Basic tool to create a Xapian search index for a git repository
 # configured for public-inbox.
@@ -18,22 +18,18 @@ GetOptions($opt, qw(verbose|v+ reindex jobs|j=i prune indexlevel|L=s))
        or die "bad command-line args\n$usage";
 die "--jobs must be positive\n" if defined $opt->{jobs} && $opt->{jobs} <= 0;
 
-sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 
-# do we really care about this message?  It's annoying...
-my $warn = 'public-inbox unconfigured for serving, indexing anyways...';
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $warn);
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
 PublicInbox::Admin::require_or_die('-index');
-usage() unless @ibxs;
+unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
 my $mods = {};
 foreach my $ibx (@ibxs) {
-       if (defined $opt->{indexlevel} && !defined($ibx->{indexlevel})) {
-               # XXX: users can shoot themselves in the foot, with this...
-               $ibx->{indexlevel} = $opt->{indexlevel};
-       }
+       # XXX: users can shoot themselves in the foot, with opt->{indexlevel}
+       $ibx->{indexlevel} //= $opt->{indexlevel} //
+                       PublicInbox::Admin::detect_indexlevel($ibx);
        PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
 }
 
 PublicInbox::Admin::require_or_die(keys %$mods);
 PublicInbox::Admin::progress_prepare($opt);
-PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;
+PublicInbox::Admin::index_inbox($_, undef, $opt) for @ibxs;