X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=script%2Fpublic-inbox-init;h=6a959db76bfd6b5dbe17b9eab001e922465958f9;hp=b8d71f3512d2997736274a23921fe8f1ec91c04d;hb=67380a130f18b5b3abbee82346ff7c15185f41e8;hpb=6f9a86728b98887ae0d76234afb2679b6f6dd4ae diff --git a/script/public-inbox-init b/script/public-inbox-init index b8d71f35..6a959db7 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -17,7 +17,7 @@ PublicInbox::Admin::require_or_die('-base'); use PublicInbox::Config; use PublicInbox::InboxWritable; use PublicInbox::Import; -use File::Temp qw/tempfile/; +use File::Temp; use PublicInbox::Lock; use File::Basename qw/dirname/; use File::Path qw/mkpath/; @@ -52,8 +52,7 @@ my $lock_obj = { lock_path => "$pi_config.flock" }; PublicInbox::Lock::lock_acquire($lock_obj); # git-config will operate on this (and rename on success): -my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir); -my $cfg_tmp = UnlinkMe->new($pi_config_tmp); +my $fh = File::Temp->new(TEMPLATE => 'pi-init-XXXXXXXX', DIR => $dir); # Now, we grab another lock to use git-config(1) locking, so it won't # wait on the lock, unlike some of our internal flock()-based locks. @@ -110,7 +109,8 @@ if (-e $pi_config) { } } } -close $fh or die "failed to close $pi_config_tmp: $!\n"; +my $pi_config_tmp = $fh->filename; +close($fh) or die "failed to close $pi_config_tmp: $!\n"; my $pfx = "publicinbox.$name"; my @x = (qw/git config/, "--file=$pi_config_tmp"); @@ -177,7 +177,6 @@ if (defined $perm) { rename $pi_config_tmp, $pi_config or die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n"; -delete $cfg_tmp->{file}; $auto_unlink->DESTROY; package UnlinkMe;