init: favor --skip-epoch instead of --skip

[public-inbox.git] / script / public-inbox-init

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 5516e798b61c3e0f3bd87fbfc0df19c3d6c97d0f..39f2a067a20e21446e7561fe5240c3280253f762 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -1,16 +1,16 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Initializes a public-inbox, basically a wrapper for git-init(1)
 use strict;
 use warnings;
-my $usage = "public-inbox-init NAME REPO_DIR HTTP_URL ADDRESS [ADDRESS..]";
+my $usage = "public-inbox-init NAME INBOX_DIR HTTP_URL ADDRESS [ADDRESS..]";
 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
 use PublicInbox::Admin;
 PublicInbox::Admin::require_or_die('-base');
 require PublicInbox::Config;
-require PublicInbox::Inbox;
+require PublicInbox::InboxWritable;
 use File::Temp qw/tempfile/;
 use File::Basename qw/dirname/;
 use File::Path qw/mkpath/;
@@ -20,10 +20,11 @@ sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 my $version = undef;
 my $indexlevel = undef;
-my $skip;
-my %opts = ( 'V|version=i' => \$version,
-            'L|indexlevel=s' => \$indexlevel,
-            'S|skip=i' => \$skip,
+my $skip_epoch;
+my %opts = (
+       'V|version=i' => \$version,
+       'L|indexlevel=s' => \$indexlevel,
+       'S|skip|skip-epoch=i' => \$skip_epoch,
 );
 GetOptions(%opts) or usage();
 PublicInbox::Admin::indexlevel_ok_or_die($indexlevel) if defined $indexlevel;
@@ -38,10 +39,11 @@ my $pi_config = PublicInbox::Config->default_file;
 my $dir = dirname($pi_config);
 mkpath($dir); # will croak on fatal errors
 my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
+my $perm;
 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];
+       $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";
@@ -103,8 +105,8 @@ if (-f "$mainrepo/inbox.lock") {
 
 $version = 1 unless defined $version;
 
-if ($version == 1 && defined $skip) {
-       die "--skip is only supported for -V2 repos\n";
+if ($version == 1 && defined $skip_epoch) {
+       die "--skip-epoch is only supported for -V2 repos\n";
 }
 
 my $ibx = PublicInbox::Inbox->new({
@@ -115,15 +117,11 @@ my $ibx = PublicInbox::Inbox->new({
        indexlevel => $indexlevel,
 });
 
-if ($version >= 2) {
-       require PublicInbox::V2Writable;
-       PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0, $skip);
-} elsif ($version == 1) {
-       require PublicInbox::V1Writable;
-       PublicInbox::V1Writable->new($ibx, 1)->init_inbox(0, $skip);
-} else {
-       die "Unsupported -V/--version: $version\n";
-}
+my $creat_opt = {};
+PublicInbox::InboxWritable->new($ibx, $creat_opt)->init_inbox(0, $skip_epoch);
+
+# needed for git prior to v2.1.0
+umask(0077) if defined $perm;
 
 foreach my $addr (@address) {
        next if $seen{lc($addr)};
@@ -136,5 +134,11 @@ if (defined($indexlevel)) {
        x(@x, "$pfx.indexlevel", $indexlevel);
 }
 
+# needed for git prior to v2.1.0
+if (defined $perm) {
+       chmod($perm & 07777, $pi_config_tmp) or
+                       die "(f)chmod failed on future $pi_config: $!\n";
+}
+
 rename $pi_config_tmp, $pi_config or
        die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n";