diff options
author | Eric Wong <e@80x24.org> | 2019-10-17 08:19:11 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-10-17 08:19:11 +0000 |
commit | fece7fca6aeac74410a813cffcb0da338017d0ed (patch) | |
tree | dd8ebebc8ec82c65ff10723faeace03eb1152ca6 /script/public-inbox-init | |
parent | eb424226f3bc1d4a05d1b3900634fadb2ee2c140 (diff) | |
parent | 144eddbc7abaca320773dda514589a3198c8f58c (diff) | |
download | public-inbox-fece7fca6aeac74410a813cffcb0da338017d0ed.tar.gz |
* origin/inboxdir: config: remove redundant inboxdir check config: support "inboxdir" in addition to "mainrepo" examples/grok-pull.post_update_hook: use "inbox_dir"
Diffstat (limited to 'script/public-inbox-init')
-rwxr-xr-x | script/public-inbox-init | 16 |
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); |