X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=3ef6c3bdba2d33c7051fc67ae19b364652bc0e88;hb=f826a7830bce67c0f8c653baf97f7769bb2c57d9;hp=fdad1366475a079120f064667719543d73450910;hpb=24294059123d4edd9e31f211d72c641a5d1a0d72;p=public-inbox.git

diff --git a/script/public-inbox-init b/script/public-inbox-init
index fdad1366..3ef6c3bd 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -5,7 +5,7 @@
 # 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/;
@@ -15,7 +15,7 @@ use Cwd qw/abs_path/;
 
 sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-my $version = 1;
+my $version = undef;
 my %opts = ( 'V|version=i' => \$version );
 GetOptions(%opts) or usage();
 my $name = shift @ARGV or usage();
@@ -71,6 +71,21 @@ my $pfx = "publicinbox.$name";
 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;
@@ -82,11 +97,7 @@ if ($version >= 2) {
 		-primary_address => $address[0],
 	};
 	$ibx = PublicInbox::Inbox->new($ibx);
-	my $v2w = PublicInbox::V2Writable->new($ibx, 1);
-	$v2w->{parallel} = 0;
-	$v2w->idx_init;
-	$v2w->git_init(0);
-	$v2w->done;
+	PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
 } elsif ($version == 1) {
 	x(qw(git init -q --bare), $mainrepo);