X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=3ef6c3bdba2d33c7051fc67ae19b364652bc0e88;hb=be4d92e74dd0b1c8de85bc08c3c522af2d8d8656;hp=d66361dfed4877801033595430aff9b2dfa04291;hpb=052f26f3ada1042afa5acadbecc48b487f4e2d52;p=public-inbox.git
diff --git a/script/public-inbox-init b/script/public-inbox-init
index d66361df..3ef6c3bd 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -1,11 +1,12 @@
#!/usr/bin/perl -w
-# Copyright (C) 2014-2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors
+# License: AGPL-3.0+
#
# Initializes a public-inbox, basically a wrapper for git-init(1)
use strict;
use warnings;
-my $usage = "public-inbox-init NAME GIT_DIR HTTP_URL ADDRESS [ADDRESS..]";
+my $usage = "public-inbox-init NAME REPO_DIR HTTP_URL ADDRESS [ADDRESS..]";
+use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
use PublicInbox::Config;
use File::Temp qw/tempfile/;
use File::Basename qw/dirname/;
@@ -14,9 +15,11 @@ use Cwd qw/abs_path/;
sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-
+my $version = undef;
+my %opts = ( 'V|version=i' => \$version );
+GetOptions(%opts) or usage();
my $name = shift @ARGV or usage();
-my $git_dir = shift @ARGV or usage();
+my $mainrepo = shift @ARGV or usage();
my $http_url = shift @ARGV or usage();
my (@address) = @ARGV;
@address or usage();
@@ -25,9 +28,14 @@ my %seen;
my $pi_config = PublicInbox::Config->default_file;
my $dir = dirname($pi_config);
mkpath($dir); # will croak on fatal errors
-my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
+my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
if (-e $pi_config) {
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
+ my @st = stat($oh);
+ my $perm = $st[2];
+ defined $perm or die "(f)stat failed on $pi_config: $!\n";
+ chmod($perm & 07777, $fh) or
+ die "(f)chmod failed on future $pi_config: $!\n";
my $old;
{
local $/;
@@ -43,10 +51,10 @@ if (-e $pi_config) {
foreach my $addr (@address) {
my $found = $cfg->lookup($addr);
if ($found) {
- if ($found->{listname} ne $name) {
+ if ($found->{name} ne $name) {
print STDERR
"`$addr' already defined for ",
- "`$found->{listname}',\n",
+ "`$found->{name}',\n",
"does not match intend `$name'\n";
$conflict = 1;
} else {
@@ -57,18 +65,55 @@ if (-e $pi_config) {
exit(1) if $conflict;
}
-close $fh or die "failed to close $filename: $!\n";
+close $fh or die "failed to close $pi_config_tmp: $!\n";
my $pfx = "publicinbox.$name";
-my @x = (qw/git config/, "--file=$filename");
-$git_dir = abs_path($git_dir);
-x(qw(git init -q --bare), $git_dir);
+my @x = (qw/git config/, "--file=$pi_config_tmp");
+
+$mainrepo = abs_path($mainrepo);
+if (-f "$mainrepo/inbox.lock") {
+ if (!defined $version) {
+ $version = 2;
+ } elsif ($version != 2) {
+ die "$mainrepo is a -V2 repo, -V$version specified\n"
+ }
+} elsif (-d "$mainrepo/objects") {
+ if (!defined $version) {
+ $version = 1;
+ } elsif ($version != 1) {
+ die "$mainrepo is a -V1 repo, -V$version specified\n"
+ }
+}
+
+$version = 1 unless defined $version;
+
+if ($version >= 2) {
+ require PublicInbox::V2Writable;
+ require PublicInbox::Inbox;
+ my $ibx = {
+ mainrepo => $mainrepo,
+ name => $name,
+ version => $version,
+ -primary_address => $address[0],
+ };
+ $ibx = PublicInbox::Inbox->new($ibx);
+ PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
+} elsif ($version == 1) {
+ x(qw(git init -q --bare), $mainrepo);
+
+ # set a reasonable default:
+ x(qw/git config/, "--file=$mainrepo/config",
+ 'repack.writeBitmaps', 'true');
+} else {
+ die "Unsupported -V/--version: $version\n";
+}
+
foreach my $addr (@address) {
next if $seen{lc($addr)};
x(@x, "--add", "$pfx.address", $addr);
}
x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $git_dir);
+x(@x, "$pfx.mainrepo", $mainrepo);
-rename $filename, $pi_config or
- die "failed to rename `$filename' to `$pi_config': $!\n";
+rename $pi_config_tmp, $pi_config or
+ die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n";