--- cf.schmorp.de/server/utils/cfutil.in	2007/06/03 15:32:51	1.35
+++ cf.schmorp.de/server/utils/cfutil.in	2007/07/19 13:46:39	1.42
@@ -8,7 +8,7 @@
 my $DATADIR     = "@datadir@/@PACKAGE@";
 
 my $CONVERT  = "@CONVERT@";
-my $IDENTIFY = "@IDENTIFY@";
+#my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
 my $PNGNQ    = "@PNGNQ@";
@@ -23,8 +23,11 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Carp;
 use Coro::Storable; $Storable::canonical = 1;
 
+$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+
 sub usage {
    warn <<EOF;
 Usage: cfutil [-v] [-q] [--force] [--cache]
@@ -94,7 +97,7 @@
       exit 1 unless $FORCE;
    }
 
-   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+   system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
       and die "map installation failed.\n";
 
    print "maps installed successfully.\n";
@@ -103,14 +106,16 @@
 {
    our %ANIMINFO;
    our %FACEINFO;
+   our %RESOURCE;
    our @ARC;
    our %ARC;
    our $TRS;
    our $NFILE;
+   our $PATH;
 
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
 
-   our (@png, @trs, @arc); # files we are interested in
+   our (@png, @trs, @arc, @res); # files we are interested in
 
    sub commit_png($$$) {
       my ($name, $data, $T) = @_;
@@ -385,6 +390,33 @@
       }
    }
 
+   sub process_res {
+      while (@res) {
+         my ($dir, $file) = @{pop @res};
+
+         my $data;
+         aio_load "$dir/$file", $data;
+
+         my $copyright;
+         aio_load "$dir/copyright", $copyright;
+
+         $file =~ s/\.res$//;
+         $file =~ /\.([^.]+)$/
+            or next;
+
+         my $type = $1;
+
+         substr $dir, 0, 1 + length $PATH, "";
+
+         $RESOURCE{"$dir/$file"} = {
+            type      => $1,
+            copyright => $copyright,
+            data      => $data,
+            chksum    => Digest::MD5::md5 $data,
+         };
+      }
+   }
+
    sub find_files;
    sub find_files {
       my ($path) = @_;
@@ -403,6 +435,8 @@
                push @trs, [$path, $file];
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
+            } elsif ($file =~ /\.(ogg|jpg|res)$/) {
+               push @res, [$path, $file];
             } else {
                warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
@@ -413,6 +447,8 @@
    sub inst_arch($) {
       my (undef, $path) = @_;
 
+      $PATH = $path;
+
       print "\n",
             "Installing '$path' to '$DATADIR'\n",
             "\n",
@@ -436,6 +472,7 @@
          (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
          (async \&process_trs), (async \&process_trs),
          (async \&process_arc), (async \&process_arc),
+         (async \&process_res), (async \&process_res),
       );
 
       {
@@ -513,6 +550,7 @@
             version => 2,
             faceinfo => \%FACEINFO,
             animinfo => \%ANIMINFO,
+            resource => \%RESOURCE,
          };
       }