--- cf.schmorp.de/server/utils/cfutil.in	2007/07/12 08:40:14	1.38
+++ cf.schmorp.de/server/utils/cfutil.in	2007/07/24 04:55:35	1.44
@@ -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";
@@ -389,7 +392,7 @@
 
    sub process_res {
       while (@res) {
-         my ($dir, $file) = @{pop @res};
+         my ($dir, $file, $type) = @{pop @res};
 
          my $data;
          aio_load "$dir/$file", $data;
@@ -401,12 +404,10 @@
          $file =~ /\.([^.]+)$/
             or next;
 
-         my $type = $1;
-
          substr $dir, 0, 1 + length $PATH, "";
 
          $RESOURCE{"$dir/$file"} = {
-            type      => $1,
+            type      => $type,
             copyright => $copyright,
             data      => $data,
             chksum    => Digest::MD5::md5 $data,
@@ -425,15 +426,33 @@
          find_files "$path/$_"
             for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
 
+         my $dir = $path;
+         substr $dir, 0, 1 + length $PATH, "";
+
          for my $file (@$nondirs) {
-            if ($file =~ /\.png$/) {
+            if ($dir =~ /^music(?:\/|$)/) {
+               push @res, [$path, $file, 3] # FT_MUSIC
+                  if $file =~ /\.(ogg)$/;
+
+            } elsif ($dir =~ /^sounds(?:\/|$)/) {
+               push @res, [$path, $file, 5] # FT_SOUND
+                  if $file =~ /\.(wav|ogg)$/;
+
+            } elsif ($dir =~ /^res(?:\/|$)/) {
+               push @res, [$path, $file, 0] # FT_FACE
+                  if $file =~ /\.(jpg|png)$/;
+               push @res, [$path, $file, 7] # FT_RSRC
+                  if $file =~ /\.(res)$/;
+
+            } elsif ($file =~ /\.png$/) {
                push @png, ["$path/$file", 0];
+
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
+
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
-            } elsif ($file =~ /\.(ogg|res)$/) {
-               push @res, [$path, $file];
+
             } else {
                warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }