From 3c39f9c942a6975245fda878e9b957d8d3367662 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 16 Oct 2019 08:59:55 +0000 Subject: config: support "inboxdir" in addition to "mainrepo" "mainrepo" ws a bad name and artifact from the early days when I intended for there to be a "spamrepo" (now just the ENV{PI_EMERGENCY} Maildir). With v2, "mainrepo" can be especially confusing, since v2 needs at least two git repositories (epoch + all.git) to function and we shouldn't confuse users by having them point to a git repository for v2. Much of our documentation already references "INBOX_DIR" for command-line arguments, so use "inboxdir" as the git-config(1)-friendly variant for that. "mainrepo" remains supported indefinitely for compatibility. Users may need to revert to old versions, or may be referring to old documentation and must not be forced to change config files to account for this change. So if you're using "mainrepo" today, I do NOT recommend changing it right away because other bugs can lurk. Link: https://public-inbox.org/meta/874l0ice8v.fsf@alyssa.is/ --- scripts/dupe-finder | 2 +- scripts/import_vger_from_mbox | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/dupe-finder b/scripts/dupe-finder index 1e980936..8060a9d7 100644 --- a/scripts/dupe-finder +++ b/scripts/dupe-finder @@ -14,7 +14,7 @@ my $ibx; if (index($repo, '@') > 0) { $ibx = PublicInbox::Config->new->lookup($repo); } elsif (-d $repo) { - $ibx = { mainrepo => $repo, address => 'unnamed@example.com' }; + $ibx = { inboxdir => $repo, address => 'unnamed@example.com' }; $ibx = PublicInbox::Inbox->new($ibx); } else { $ibx = PublicInbox::Config->new->lookup_name($repo); diff --git a/scripts/import_vger_from_mbox b/scripts/import_vger_from_mbox index b2dd5b3a..6329dd16 100644 --- a/scripts/import_vger_from_mbox +++ b/scripts/import_vger_from_mbox @@ -23,9 +23,9 @@ if ($variant ne 'mboxrd' && $variant ne 'mboxo') { } my $name = shift or die $usage; # git my $email = shift or die $usage; # git@vger.kernel.org -my $mainrepo = shift or die $usage; # /path/to/v2/repo +my $inboxdir = shift or die $usage; # /path/to/v2/repo my $ibx = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => $name, version => $version, address => [ $email ], @@ -37,7 +37,7 @@ unless ($dry_run) { require PublicInbox::V2Writable; PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0); } else { - system(qw(git init --bare -q), $mainrepo) == 0 or die; + system(qw(git init --bare -q), $inboxdir) == 0 or die; } } $ibx = PublicInbox::InboxWritable->new($ibx); -- cgit v1.2.3-24-ge0c7