--- cf.schmorp.de/server/utils/cfutil.in	2007/03/12 17:26:41	1.12
+++ cf.schmorp.de/server/utils/cfutil.in	2007/03/17 19:57:02	1.18
@@ -22,6 +22,7 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Storable; $Storable::canonical = 1;
 
 sub usage {
    warn <<EOF;
@@ -69,14 +70,17 @@
 sub inst_maps($) {
    my (undef, $path) = @_;
 
-   print "installing '$path' to '$DATADIR/maps'\n\n";
+   print "installing '$path' to '$DATADIR/maps'\n";
 
    if (!-f "$path/regions") {
       warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
       exit 1 unless $FORCE;
    }
 
-   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded";
+   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+      and die "map installation failed.\n";
+
+   print "maps installed successfully.\n";
 }
 
 {
@@ -86,7 +90,6 @@
    our $TRS;
    our $NFILE;
    our %ANIM;
-   our $SMOOTH;
 
    our (@png, @trs, @arc); # files we are interested in
 
@@ -121,7 +124,7 @@
          (my $face = $path) =~ s/^.*\///;
          my $T = 32;
 
-         unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
+         unless ($face =~ s/\.32x32\.png$//) {
             warn "$path: weird filename, skipping.\n";
             next;
          }
@@ -256,7 +259,12 @@
                }
 
                if (my $smooth = delete $o->{smoothface}) {
-                  $SMOOTH .= "$smooth\n";
+                  my ($face, $smooth) = split /\s+/, $smooth;
+                  # skip empty_S.x11, it seems to server no purpose whatsoever
+                  # but increases bandwidth demands and worse.
+                  unless ($smooth eq "empty_S.x11") {
+                     $FACEINFO{$face}{smooth} = $smooth;
+                  }
                }
             }
          }
@@ -306,7 +314,7 @@
    sub inst_arch($) {
       my (undef, $path) = @_;
 
-      print "installing '$path' to '$DATADIR'\n\n";
+      print "installing '$path' to '$DATADIR'\n";
 
       if (!-d "$path/treasures") {
          warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
@@ -336,12 +344,6 @@
       }
 
       {
-         open my $fh, ">:utf8", "$DATADIR/smooth~"
-            or die "$DATADIR/smooth~: $!";
-         print $fh $SMOOTH;
-      }
-
-      {
          open my $fh, ">:utf8", "$DATADIR/treasures~"
             or die "$DATADIR/treasures~: $!";
          print $fh $TRS;
@@ -361,13 +363,17 @@
          open my $fh, ">:perlio", "$DATADIR/faces~"
             or die "$DATADIR/faces~: $!";
 
+         $FACEINFO{""} = { version => 1};
          print $fh Storable::nfreeze \%FACEINFO;
       }
 
-      for (qw(archetypes faces animations treasures smooth)) {
+      for (qw(archetypes faces animations treasures)) {
          chmod 0644, "$DATADIR/$_~";
-         rename "$DATADIR/$_~", "$DATADIR/$_";
+         rename "$DATADIR/$_~", "$DATADIR/$_"
+            or die "$DATADIR/$_: $!";
       }
+
+      print "archetype data installed successfully.\n";
    }
 }