extindex: remove skip-docdata option

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

diff --git a/script/public-inbox-extindex b/script/public-inbox-extindex
index bb1e174aa338a6a2851062c757977f901786b90d..78d6d9d91b7dbba3740d4618f98e8bca136cae1a 100644 (file)
--- a/script/public-inbox-extindex
+++ b/script/public-inbox-extindex
@@ -26,18 +26,21 @@ GetOptions($opt, qw(verbose|v+ reindex rethread compact|c+ jobs|j=i
                fsync|sync!
                indexlevel|index-level|L=s max_size|max-size=s
                batch_size|batch-size=s
-               skip-docdata all help|h))
+               all help|h))
        or die $help;
 if ($opt->{help}) { print $help; exit 0 };
 die "--jobs must be >= 0\n" if defined $opt->{jobs} && $opt->{jobs} < 0;
 
 # require lazily to speed up --help
 my $eidx_dir = shift(@ARGV) // die "E: $help";
+local $SIG{USR1} = 'IGNORE'; # to be overridden in eidx_sync
 require PublicInbox::Admin;
 my $cfg = PublicInbox::Config->new;
 my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg);
 PublicInbox::Admin::require_or_die(qw(-search));
 PublicInbox::Admin::progress_prepare($opt);
+my $env = PublicInbox::Admin::index_prepare($opt, $cfg);
+local %ENV = (%ENV, %$env) if $env;
 require PublicInbox::ExtSearchIdx;
 my $eidx = PublicInbox::ExtSearchIdx->new($eidx_dir, $opt);
 $eidx->attach_inbox($_) for @ibxs;