From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, URIBL_SBL,URIBL_SBL_A shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A259C1FA17 for ; Tue, 8 Dec 2020 21:21:31 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/6] extindex: do not use current dir like -index does Date: Tue, 8 Dec 2020 21:21:28 +0000 Message-Id: <20201208212130.5832-5-e@80x24.org> In-Reply-To: <20201208212130.5832-1-e@80x24.org> References: <20201208212130.5832-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: At least not for resolving inboxes, since there's no good way for a user to specify what is an inbox or extindex directory without a command-line switch. Instead of changing the -extindex command, we change the -index command internals to rely on the new {-use_cwd} flag to avoid internal use of negation, since double-negatives and the like are confusing to me. --- lib/PublicInbox/Admin.pm | 2 +- script/public-inbox-index | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 9d48e5eb..ec80b565 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -118,7 +118,7 @@ EOF } else { # directories specified on the command-line my $i = 0; my @dirs = @$argv; - push @dirs, '.' unless @dirs; + push @dirs, '.' if !@dirs && $opt->{-use_cwd}; foreach (@dirs) { my $v; my $dir = resolve_repo_dir($_, \$v); diff --git a/script/public-inbox-index b/script/public-inbox-index index 5909801e..8a61817c 100755 --- a/script/public-inbox-index +++ b/script/public-inbox-index @@ -51,6 +51,7 @@ require PublicInbox::Admin; PublicInbox::Admin::require_or_die('-index'); my $cfg = PublicInbox::Config->new; # Config is loaded by Admin +$opt->{-use_cwd} = 1; my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg); PublicInbox::Admin::require_or_die('-index'); unless (@ibxs) { print STDERR $help; exit 1 }