about summary refs log tree commit homepage
path: root/script/public-inbox-init
diff options
authorEric Wong <e@80x24.org>2019-10-16 08:59:55 +0000
committerEric Wong <e@80x24.org>2019-10-16 09:00:26 +0000
commit3c39f9c942a6975245fda878e9b957d8d3367662 (patch)
tree10c2ea542787ff08dae59ddd3f13f129ed63dd76 /script/public-inbox-init
parent28264f7af4d9f4fab951f0613a0b08b6e98af7d3 (diff)
"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/
Diffstat (limited to 'script/public-inbox-init')
1 files changed, 8 insertions, 8 deletions
diff --git a/script/public-inbox-init b/script/public-inbox-init
index 8fd2f9dc..50711266 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -31,7 +31,7 @@ my %opts = (
 GetOptions(%opts) or usage();
 PublicInbox::Admin::indexlevel_ok_or_die($indexlevel) if defined $indexlevel;
 my $name = shift @ARGV or usage();
-my $mainrepo = shift @ARGV or usage();
+my $inboxdir = shift @ARGV or usage();
 my $http_url = shift @ARGV or usage();
 my (@address) = @ARGV;
 @address or usage();
@@ -112,18 +112,18 @@ close $fh or die "failed to close $pi_config_tmp: $!\n";
 my $pfx = "publicinbox.$name";
 my @x = (qw/git config/, "--file=$pi_config_tmp");
-$mainrepo = abs_path($mainrepo);
-if (-f "$mainrepo/inbox.lock") {
+$inboxdir = abs_path($inboxdir);
+if (-f "$inboxdir/inbox.lock") {
         if (!defined $version) {
                 $version = 2;
         } elsif ($version != 2) {
-                die "$mainrepo is a -V2 repo, -V$version specified\n"
+                die "$inboxdir is a -V2 repo, -V$version specified\n"
-} elsif (-d "$mainrepo/objects") {
+} elsif (-d "$inboxdir/objects") {
         if (!defined $version) {
                 $version = 1;
         } elsif ($version != 1) {
-                die "$mainrepo is a -V1 repo, -V$version specified\n"
+                die "$inboxdir is a -V1 repo, -V$version specified\n"
@@ -134,7 +134,7 @@ if ($version == 1 && defined $skip_epoch) {
 my $ibx = PublicInbox::Inbox->new({
-        mainrepo => $mainrepo,
+        inboxdir => $inboxdir,
         name => $name,
         version => $version,
         -primary_address => $address[0],
@@ -152,7 +152,7 @@ foreach my $addr (@address) {
         x(@x, "--add", "$pfx.address", $addr);
 x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $mainrepo);
+x(@x, "$pfx.inboxdir", $inboxdir);
 if (defined($indexlevel)) {
         x(@x, "$pfx.indexlevel", $indexlevel);