infra: dgit-repos-server: Break out mkscript

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 6131774e7c43c7e2816cad08bfbcc3b54329947e..54a63f926116b87673baa22d7b821795cca4cf97 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -407,16 +407,21 @@ sub makeworkingclone () {
     rmtree "${workrepo}_fresh";
 }
 
     rmtree "${workrepo}_fresh";
 }
 

+sub mkscript ($$) {
+    my ($path,$contents) = @_;
+    my $fh = new IO::File $path, O_WRONLY|O_CREAT|O_TRUNC, 0777
+       or die "$path: $!";
+    print $fh $contents or die "$path: $!";
+    close $fh or die "$path: $!";
+}
+

 sub setupstunthook () {
     my $prerecv = "$workrepo/hooks/pre-receive";
 sub setupstunthook () {
     my $prerecv = "$workrepo/hooks/pre-receive";

-    my $fh = new IO::File $prerecv, O_WRONLY|O_CREAT|O_TRUNC, 0777
-       or die "$prerecv: $!";
-    print $fh <<END or die "$prerecv: $!";
+    mkscript $prerecv, <<END;

 #!/bin/sh
 set -e
 exec $0 --pre-receive-hook $package
 END
 #!/bin/sh
 set -e
 exec $0 --pre-receive-hook $package
 END

-    close $fh or die "$prerecv: $!";

     $ENV{'DGIT_DRS_WORK'}= $workrepo;
     $ENV{'DGIT_DRS_DEST'}= $destrepo;
     printdebug " stunt hook set up $prerecv\n";
     $ENV{'DGIT_DRS_WORK'}= $workrepo;
     $ENV{'DGIT_DRS_DEST'}= $destrepo;
     printdebug " stunt hook set up $prerecv\n";