X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=10d3ad45b2e6edb70ac51f809bb0b1d16d64a8b4;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=8fd2f9dc2f5c490cb8325dbd8b6b74b91febd5be;hpb=6242da34fbe20940e3e258d2ec80e9aeef0438e1;p=public-inbox.git
diff --git a/script/public-inbox-init b/script/public-inbox-init
index 8fd2f9dc..10d3ad45 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -1,16 +1,22 @@
#!/usr/bin/perl -w
-# Copyright (C) 2014-2019 all contributors
+# Copyright (C) 2014-2020 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 INBOX_DIR HTTP_URL ADDRESS [ADDRESS..]";
+sub usage {
+ print STDERR < $dir);
my $lockfile = "$pi_config.lock";
my $lockfh;
sysopen($lockfh, $lockfile, O_RDWR|O_CREAT|O_EXCL) or do {
- $lockfh = undef;
warn "could not open config file: $lockfile: $!\n";
exit(255);
};
-END { unlink($lockfile) if $lockfh };
-
+my $auto_unlink = UnlinkMe->new($lockfile);
my $perm;
if (-e $pi_config) {
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
@@ -112,18 +114,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 +136,7 @@ if ($version == 1 && defined $skip_epoch) {
}
my $ibx = PublicInbox::Inbox->new({
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => $name,
version => $version,
-primary_address => $address[0],
@@ -149,13 +151,13 @@ umask(0077) if defined $perm;
foreach my $addr (@address) {
next if $seen{lc($addr)};
- x(@x, "--add", "$pfx.address", $addr);
+ PublicInbox::Import::run_die([@x, "--add", "$pfx.address", $addr]);
}
-x(@x, "$pfx.url", $http_url);
-x(@x, "$pfx.mainrepo", $mainrepo);
+PublicInbox::Import::run_die([@x, "$pfx.url", $http_url]);
+PublicInbox::Import::run_die([@x, "$pfx.inboxdir", $inboxdir]);
if (defined($indexlevel)) {
- x(@x, "$pfx.indexlevel", $indexlevel);
+ PublicInbox::Import::run_die([@x, "$pfx.indexlevel", $indexlevel]);
}
# needed for git prior to v2.1.0
@@ -166,3 +168,18 @@ if (defined $perm) {
rename $pi_config_tmp, $pi_config or
die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n";
+$auto_unlink->DESTROY;
+
+package UnlinkMe;
+use strict;
+
+sub new {
+ my ($klass, $file) = @_;
+ bless { file => $file }, $klass;
+}
+
+sub DESTROY {
+ my $f = delete($_[0]->{file});
+ unlink($f) if defined($f);
+}
+1;