script/public-inbox-compact | 39 +++++++++++++++++++++++++++++---------- diff --git a/script/public-inbox-compact b/script/public-inbox-compact index b5fa00862c4d20239623ac8848c330cd360e86db..a6bb62bd4c266c3f052e6e649952cf6c9a003c1e 100755 --- a/script/public-inbox-compact +++ b/script/public-inbox-compact @@ -1,18 +1,37 @@ -#!/usr/bin/perl -w +#!perl -w # Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; -use warnings; +use v5.10.1; use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); -use PublicInbox::InboxWritable; -use PublicInbox::Xapcmd; -use PublicInbox::Admin; +my $usage = 'public-inbox-compact INBOX_DIR'; +my $opt = { compact => 1, -coarse_lock => 1 }; +my $help = <{help}) { print $help; exit 0 }; + +require PublicInbox::Admin; PublicInbox::Admin::require_or_die('-index'); -my $usage = "Usage: public-inbox-compact INBOX_DIR\n"; -my $opt = { compact => 1, -coarse_lock => 1 }; -GetOptions($opt, qw(all), @PublicInbox::Xapcmd::COMPACT_OPT) or - die "bad command-line args\n$usage"; -my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt) or die $usage; +PublicInbox::Admin::progress_prepare($opt); + +require PublicInbox::InboxWritable; +require PublicInbox::Xapcmd; +my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt); +unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 } foreach (@ibxs) { my $ibx = PublicInbox::InboxWritable->new($_); PublicInbox::Xapcmd::run($ibx, 'compact', $opt);