about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-12-08 21:21:28 +0000
committerEric Wong <e@80x24.org>2020-12-09 21:13:35 +0000
commitb1bf076de26e8803e399b070bbc418a6ecd4ebe1 (patch)
tree8b61f47fa1d71876fcf59fc01e398b3dacc02ed2
parent0d38f65c490466837ae091afa7a7b6f59d04ce7c (diff)
downloadpublic-inbox-b1bf076de26e8803e399b070bbc418a6ecd4ebe1.tar.gz
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.
-rw-r--r--lib/PublicInbox/Admin.pm2
-rwxr-xr-xscript/public-inbox-index1
2 files changed, 2 insertions, 1 deletions
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 }