+make(1) locking by flock(1)

[MyWeb.git] / Web.pm

diff --git a/Web.pm b/Web.pm
index 35bdb38..2a93ce1 100644 (file)
--- a/Web.pm
+++ b/Web.pm
@@ -413,6 +413,13 @@ my($url,$contents,%args)=@_;
        return $contents;
 }
 
+sub make ($)
+{
+my($cmd)=@_;
+
+       system {'flock'} 'flock','-x',top_dir_disk(),$cmd.' >&2';
+}
+
 sub img_size ($$)
 {
 my($width,$height)=@_;
@@ -433,7 +440,7 @@ my @img_variants=(
                { "id"=>"png","qs"=>1.0,"content-type"=>"image/png" },
                { "id"=>"gif","qs"=>0.9,"content-type"=>"image/gif" },
                );
-my $img_variants_re='[.](?:'.join('|',map(($_->{"id"}),@img_variants)).')$';
+my $img_variants_re='[.](?:'.join('|',"jpeg",map(($_->{"id"}),@img_variants)).')$';
 
 sub img_src ($)
 {
@@ -460,8 +467,8 @@ my($file_base)=@_;
        for my $var (@img_variants) {
                my $file=$file_base_disk.".".$var->{"id"};
                # TODO: Somehow quickly check dependencies?
-               system 'make >&2 -s --no-print-directory'
-                                               .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'"
+               make('make -s --no-print-directory'
+                                               .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'")
                                if !-f $file;
                push @nego_variants,negotiate_variant(
                                %$var,
@@ -567,6 +574,9 @@ HERE
 
        print '<meta name="robots" content="'.($W->{"indexme"} ? "" : "no" ).'index,follow" />'."\n";
        print $W->{"head"};
+       for my $type (qw(prev next index contents start up)) {
+               do { print '<link rel="'.$type.'" href="'.$_.'" />'."\n" if $_; } for ($W->{"rel_$type"});
+               }
        print "</head><body";
        print ' bgcolor="black" text="white" link="aqua" vlink="teal"'
                        if $W->{"browser"}->netscape() && $W->{"browser"}->major<=4;