# 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 <<EOF;
+Usage: public-inbox-init NAME INBOX_DIR HTTP_URL ADDRESS [ADDRESS..]
+EOF
+ exit 1;
+}
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::InboxWritable;
+use PublicInbox::Config;
+use PublicInbox::InboxWritable;
use File::Temp qw/tempfile/;
use PublicInbox::Lock;
use File::Basename qw/dirname/;
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 $indexlevel = undef;
my $skip_epoch;
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();
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";
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"
}
}
}
my $ibx = PublicInbox::Inbox->new({
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => $name,
version => $version,
-primary_address => $address[0],
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);
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;