X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fupdate-master-info;h=3aa9ac2d802fd8508d0e8f5ab43f0730d383d855;hb=bd155443745759a5a9c95cd1cbce5a8f73894737;hp=a52b212366ab635becd16399a26baf5ae3cde1b7;hpb=877b0ba6b2d72d7957e2a8015520b87371cba6c9;p=ypp-sc-tools.main.git

diff --git a/yarrg/update-master-info b/yarrg/update-master-info
index a52b212..3aa9ac2 100755
--- a/yarrg/update-master-info
+++ b/yarrg/update-master-info
@@ -17,6 +17,27 @@ foreach my $oceanname (sort keys %oceans) {
 }
 
 print STDERR "installing new master-info...\n";
-my $df= "$rsyncdir/master-info.txt";
-system('cp','--','master-info.txt',"$df.tmp"); die $? if $?;
-system('mv','--',"$df.tmp",$df); die $? if $?
+
+my $sfn= 'source-info.txt';
+my $dfn= "$rsyncdir/master-info.txt";
+
+my $sf= new IO::File $sfn or die "$sfn $!";
+my $df= new IO::File "$dfn.tmp", 'w' or die "$dfn.tmp $!";
+
+my $h;
+while (<$sf>) {
+    chomp; s/\s+$//;
+    next if m/^\s*\#/ || !m/\S/;
+    if (m/^\S.*/) {
+	$h= $&;
+    }
+    die "$_ ?" unless defined $h;
+    if ($h =~ m/^commods|^\%[a-z]\b/) {
+	s/\t.*//;
+    }
+    print $df $_, "\n" or die $!;
+}
+
+$sf->error and die $!;
+close $df or die $!;
+rename "$dfn.tmp", "$dfn" or die $!;