ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.69 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.94 by root, Wed Oct 6 00:18:14 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::EV; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
19use YAML (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Deliantra; 49
24use Coro; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
… …
48my $VERBOSE = 1; 74my $VERBOSE = 1;
49my $CACHE = 0; 75my $CACHE = 0;
50my $FORCE; 76my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
53 80
54our %COLOR = ( 81our %COLOR = (
55 black => 0, 82 black => 0,
56 white => 1, 83 white => 1,
57 navy => 2, 84 navy => 2,
… …
70END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
71 98
72my $s_INT = EV::signal INT => sub { exit 1 }; 99my $s_INT = EV::signal INT => sub { exit 1 };
73my $s_TERM = EV::signal TERM => sub { exit 1 }; 100my $s_TERM = EV::signal TERM => sub { exit 1 };
74 101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
123
75mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
77 126
78sub fork_sub(&) { 127sub fork_sub(&) {
79 my ($cb) = @_; 128 my ($cb) = @_;
… …
107 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
108 157
109 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
110} 159}
111 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
173 "."
174
175 } elsif ($stem =~ /^player\//) {
176 "\@"
177
178 } else {
179 substr $stem, 0, 1
180 }
181}
182
112{ 183{
113 our %ANIMINFO; 184 our %ANIMINFO;
114 our %FACEINFO; 185 our %FACEINFO;
115 our %RESOURCE; 186 our %RESOURCE;
116 our @ARC; 187 our @ARC;
… …
125 our $c_trs = new Coro::Channel; 196 our $c_trs = new Coro::Channel;
126 our $c_res = new Coro::Channel; 197 our $c_res = new Coro::Channel;
127 198
128 our @c_png; 199 our @c_png;
129 200
130 sub commit_png($$$) { 201 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 202 my ($stem, $name, $data, $T) = @_;
132 203
204 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 205 $FACEINFO{$name}{"data$T"} = $data;
134 } 206 }
135 207
136 sub process_png { 208 sub process_png {
137 while (@c_png) { 209 while (@c_png) {
… …
273 fork_sub { 345 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 346 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 347 system $OPTIPNG, "-i0", "-q", "$other~";
276 348
277 # reduce smoothfaces >10000 bytes 349 # reduce smoothfaces >10000 bytes
350 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 351 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 352 my $ncolor = 256;
280 while () { 353 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 354 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 355 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 356 last if 10000 > -s "$other~~";
… …
354 427
355 if (0 > aio_load $file, $tile) { 428 if (0 > aio_load $file, $tile) {
356 die "$path: unable to read tile +$x+$y, aborting.\n"; 429 die "$path: unable to read tile +$x+$y, aborting.\n";
357 } 430 }
358 IO::AIO::aio_unlink $file unless $CACHE; 431 IO::AIO::aio_unlink $file unless $CACHE;
359 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 432 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
360 } 433 }
361 } else { 434 } else {
362 # use as-is (either small, use smooth) 435 # use as-is (either small, use smooth)
363 commit_png $face, $png, $T; 436 commit_png $stem, $face, $png, $T;
364 } 437 }
365 438
366 aio_unlink $path if $delete; 439 aio_unlink $path if $delete;
367 } 440 }
368 } 441 }
… …
379 push @ARC, $o; 452 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 453 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 454 $ARC{$m->{_name}} = $m;
382 } 455 }
383 456
384 $o->{editor_folder} = $dir; 457 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385 458
386 my $visibility = delete $o->{visibility}; 459 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap}; 460 my $magicmap = delete $o->{magicmap};
461 my $glyph = delete $o->{glyph};
388 462
389 # find upper left corner :/ 463 # find upper left corner :/
390 # omg, this is sooo broken 464 # omg, this is sooo broken
391 my ($dx, $dy); 465 my ($dx, $dy);
392 for (my $o = $o; $o; $o = $o->{more}) { 466 for (my $o = $o; $o; $o = $o->{more}) {
… …
402 476
403 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 477 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
404 478
405 $visibility = delete $o->{visibility} if exists $o->{visibility}; 479 $visibility = delete $o->{visibility} if exists $o->{visibility};
406 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 480 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
481 $glyph = delete $o->{glyph} if exists $o->{glyph};
407 482
408 my $anim = delete $o->{anim}; 483 my $anim = delete $o->{anim};
409 484
410 if ($anim) { 485 if ($anim) {
411 # possibly add $ext to the animation name to avoid 486 # possibly add $ext to the animation name to avoid
… …
442 517
443 next if $face =~ /^blank.x11$|^empty.x11$/; 518 next if $face =~ /^blank.x11$|^empty.x11$/;
444 519
445 $info->{visibility} = $visibility if defined $visibility; 520 $info->{visibility} = $visibility if defined $visibility;
446 $info->{magicmap} = $magicmap if defined $magicmap; 521 $info->{magicmap} = $magicmap if defined $magicmap;
522 $info->{glyph} = $glyph if defined $glyph;
447 } 523 }
448 524
449 if (my $smooth = delete $o->{smoothface}) { 525 if (my $smooth = delete $o->{smoothface}) {
450 my %kv = split /\s+/, $smooth; 526 my %kv = split /\s+/, $smooth;
451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 527 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
520 if ($meta->{license} =~ s/^#//) { 596 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 597 $meta->{license} = ({
522 "pd" => "Public Domain", 598 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 599 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 600 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
601 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
525 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 602 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
526 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 603 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}} 604 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 605 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 606 }
530 607
608 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
609 ($meta->{author} = $1) =~ s/_/ /g;
610 }
611
531 $file =~ s/\.res$//; 612 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 613 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 614
534 substr $dir, 0, 1 + length $PATH, ""; 615 substr $dir, 0, 1 + length $PATH, "";
535 616
536 if (my $filter = $meta->{cfutil_filter}) { 617 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 618 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Load $data; 619 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 620 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 621 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 622 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 623 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 624 $data = JSON::XS::encode_json $data;
… …
561 IO::AIO::aioreq_pri 4; 642 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 643 IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 644 my ($dirs, $nondirs) = @_;
564 645
565 find_files "$path/$_" 646 find_files "$path/$_"
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 647 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 648
568 my $dir = $path; 649 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 650 substr $dir, 0, 1 + length $PATH, "";
570 651
571 for my $file (@$nondirs) { 652 for my $file (@$nondirs) {
… …
598 } else { 679 } else {
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 680 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 } 681 }
601 } 682 }
602 }; 683 };
684 }
685
686 sub generate_plurals {
687# use Lingua::EN::Inflect ();
688# Lingua::EN::Inflect::classical;
689# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
690# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
691#
692# for my $a (@ARC) {
693# my $name = $a->{name} || $a->{_name};
694#
695# next unless $a->{name_pl};
696# next if $a->{invisible};
697# next if $a->{is_floor};
698# next if $a->{no_pick};
699#
700# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
701# my $pl = $test =~ /^(?:eq|p:.)$/
702# ? $name
703# : Lingua::EN::Inflect::PL $name;
704#
705# if ($pl ne $a->{name_pl}) {
706# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
707# }
708# }
603 } 709 }
604 710
605 sub inst_arch($) { 711 sub inst_arch($) {
606 my (undef, $path) = @_; 712 my (undef, $path) = @_;
607 713
… …
630 my @a_res = map +(async \&process_res), 1..2; 736 my @a_res = map +(async \&process_res), 1..2;
631 my @a_trs = map +(async \&process_trs), 1..2; 737 my @a_trs = map +(async \&process_trs), 1..2;
632 738
633 IO::AIO::flush; 739 IO::AIO::flush;
634 740
635 $c_res->put (undef) for @a_res; 741 $c_res->shutdown;
636 $c_arc->put (undef) for @a_arc; 742 $c_arc->shutdown;
637 $c_trs->put (undef) for @a_trs; 743 $c_trs->shutdown;
638 744
639 print "start file scan, arc, res processing...\n" if $VERBOSE; 745 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 746
641 $_->join for @a_arc; # need to parse all archetypes before png processing 747 $_->join for @a_arc; # need to parse all archetypes before png processing
642 748
… …
648 $_->join for (@a_trs, @a_res, @a_png); 754 $_->join for (@a_trs, @a_res, @a_png);
649 755
650 print "scanning done, processing results...\n" if $VERBOSE; 756 print "scanning done, processing results...\n" if $VERBOSE;
651 { 757 {
652 # remove path prefix from editor_folder 758 # remove path prefix from editor_folder
759 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 760 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 761 for values %ARC;
655 762
656 print "resolving inheritance tree...\n" if $VERBOSE; 763 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 764 # resolve inherit
658 while () { 765 while () {
659 my $progress; 766 my $progress;
660 my $loop; 767 my $loop;
661 768
662 for my $o (values %ARC) { 769 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 770 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 771 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 772 if ($s->{inherit}) {
666 $loop = $s; 773 $loop = $s;
667 } else { 774 } else {
668 delete $o->{inherit}; 775 delete $o->{inherit};
… …
687 } 794 }
688 795
689 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 796 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 797 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 798
799 print "generating plurals...\n" if $VERBOSE;
800 generate_plurals;
801
692 print "writing archetypes...\n" if $VERBOSE; 802 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 803 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 804 or die "$DATADIR/archetypes~: $!";
695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 805 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
696 } 806 }
697 807
698 { 808 {
699 print "writing treasures...\n" if $VERBOSE; 809 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 810 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 811 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 812 print $fh $TRS;
703 } 813 }
704 814
… …
706 print "processing facedata...\n" if $VERBOSE; 816 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 817 while (my ($k, $v) = each %FACEINFO) {
708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 818 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 819 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
710 820
821 make_hash $k, $v->{data32}, $v->{hash32};
822 make_hash $k, $v->{data64}, $v->{hash64};
823
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 824 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 825 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
713 826
714 if (my $magicmap = $v->{magicmap}) { 827 if (my $magicmap = $v->{magicmap}) {
715 $magicmap =~ y/A-Z_\-/a-z/d; 828 $magicmap =~ y/A-Z_\-/a-z/d;
716 $v->{magicmap} = $COLOR{$magicmap}; 829 $v->{magicmap} = $COLOR{$magicmap};
717 } 830 }
718 831
832 my $stem = delete $v->{stem};
833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
836
719 delete $v->{arc}; 837 delete $v->{arc};
720 } 838 }
721 839
722 print "writing facedata...\n" if $VERBOSE; 840 print "processing resources...\n" if $VERBOSE;
841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
842 while (my ($k, $v) = each %RESOURCE) {
843
844 if ($v->{meta} && $v->{meta}{datadir}) {
845 delete $RESOURCE{$k};
846
847 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
848
849 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
850 open my $fh, ">:raw", "$DATADIR/$k~"
851 or die "$DATADIR/$k~: $!";
852 syswrite $fh, $v->{data};
853 push @COMMIT, $k;
854
855 } else {
856 if ($v->{type} & 1) {
857 # prepend meta info
858
859 my $meta = $enc->encode ({
860 name => $k,
861 %{ $v->{meta} || {} },
862 });
863
864 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
865 }
866
867 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
868 }
869 }
870
871 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
872 scalar keys %FACEINFO,
873 scalar keys %ANIMINFO,
874 scalar keys %RESOURCE
875 if $VERBOSE;
876
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 877 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 878 or die "$DATADIR/facedata~: $!";
725 879
726 print $fh freeze { 880 print $fh nfreeze {
727 version => 2, 881 version => 2,
728 faceinfo => \%FACEINFO, 882 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 883 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 884 resource => \%RESOURCE,
731 }; 885 };
886
732 } 887 }
733 888
734 print "committing files...\n" if $VERBOSE; 889 print "committing files...\n" if $VERBOSE;
735 890
736 for (qw(archetypes facedata treasures)) { 891 for (qw(archetypes facedata treasures), @COMMIT) {
737 chmod 0644, "$DATADIR/$_~"; 892 chmod 0644, "$DATADIR/$_~";
738 rename "$DATADIR/$_~", "$DATADIR/$_" 893 rename "$DATADIR/$_~", "$DATADIR/$_"
739 or die "$DATADIR/$_: $!"; 894 or die "$DATADIR/$_: $!";
740 } 895 }
741 896

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines