init: preserve permissions of existing config file

This matches git-config(1) behavior, and implied user
intent when it comes to programatically editing files.

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 739ec9e55530c3dacdc3c6e9e33df6b099e474a6..e23d14199fda60637efd65de271a74ed35dc384b 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -28,6 +28,11 @@ mkpath($dir); # will croak on fatal errors
 my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
 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];
+       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";
        my $old;
        {
                local $/;

diff --git a/t/init.t b/t/init.t
index b78fbaf5e5a78d15b946a03290c10327aed6f731..f87dc225ce0d45c32ffbb1f481e50ffaacd14e9b 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -13,10 +13,16 @@ use constant pi_init => 'blib/script/public-inbox-init';
        my $cfgfile = "$ENV{PI_DIR}/config";
        my @cmd = (pi_init, 'blist', "$tmpdir/blist",
                   qw(http://example.com/blist blist@example.com));
-       is(system(@cmd), 0, 'public-inbox-init failed');
+       is(system(@cmd), 0, 'public-inbox-init OK');
 
        ok(-e $cfgfile, "config exists, now");
-       is(system(@cmd), 0, 'public-inbox-init failed (idempotent)');
+       is(system(@cmd), 0, 'public-inbox-init OK (idempotent)');
+
+       chmod 0666, $cfgfile or die "chmod failed: $!";
+       @cmd = (pi_init, 'clist', "$tmpdir/clist",
+                  qw(http://example.com/clist clist@example.com));
+       is(system(@cmd), 0, 'public-inbox-init clist OK');
+       is((stat($cfgfile))[2] & 07777, 0666, "permissions preserved");
 }
 
 done_testing();