| … | |
… | |
| 19 | use IO::AIO (); |
19 | use IO::AIO (); |
| 20 | use File::Temp; |
20 | use File::Temp; |
| 21 | use Crossfire; |
21 | use Crossfire; |
| 22 | use Coro; |
22 | use Coro; |
| 23 | use Coro::AIO; |
23 | use Coro::AIO; |
|
|
24 | use Coro::Util; |
| 24 | use POSIX (); |
25 | use POSIX (); |
| 25 | use Digest::MD5; |
26 | use Digest::MD5; |
| 26 | use Carp; |
27 | use Carp; |
|
|
28 | use Coro::Channel; |
| 27 | use Coro::Storable; $Storable::canonical = 1; |
29 | use Coro::Storable; $Storable::canonical = 1; |
| 28 | |
30 | |
| 29 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
31 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
| 30 | |
32 | |
| 31 | sub usage { |
33 | sub usage { |
| … | |
… | |
| 113 | our $NFILE; |
115 | our $NFILE; |
| 114 | our $PATH; |
116 | our $PATH; |
| 115 | |
117 | |
| 116 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
118 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 117 | |
119 | |
| 118 | our (@png, @trs, @arc, @res); # files we are interested in |
120 | our $c_arc = new Coro::Channel; |
|
|
121 | our $c_trs = new Coro::Channel; |
|
|
122 | our $c_res = new Coro::Channel; |
|
|
123 | |
|
|
124 | our @c_png; |
| 119 | |
125 | |
| 120 | sub commit_png($$$) { |
126 | sub commit_png($$$) { |
| 121 | my ($name, $data, $T) = @_; |
127 | my ($name, $data, $T) = @_; |
| 122 | |
128 | |
| 123 | $FACEINFO{$name}{"data$T"} = $data; |
129 | $FACEINFO{$name}{"data$T"} = $data; |
| 124 | } |
130 | } |
| 125 | |
131 | |
| 126 | sub process_png { |
132 | sub process_png { |
| 127 | while (@png) { |
133 | while (@c_png) { |
| 128 | my ($path, $delete) = @{pop @png}; |
134 | my ($path, $delete) = @{pop @c_png}; |
| 129 | |
135 | |
| 130 | my $png; |
136 | my $png; |
| 131 | aio_lstat $path; |
137 | aio_lstat $path; |
| 132 | my ($size, $mtime) = (stat _)[7,9]; |
138 | my ($size, $mtime) = (stat _)[7,9]; |
| 133 | |
139 | |
| … | |
… | |
| 170 | # possibly enlarge |
176 | # possibly enlarge |
| 171 | if (0 > aio_stat "$stem.64x64.png") { |
177 | if (0 > aio_stat "$stem.64x64.png") { |
| 172 | my $other = "$stem.64x64.png~"; |
178 | my $other = "$stem.64x64.png~"; |
| 173 | |
179 | |
| 174 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
180 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
| 175 | my $wrap = 0; # for the time being |
|
|
| 176 | fork_sub { |
181 | fork_sub { |
|
|
182 | my $CROP; |
|
|
183 | my $SRC = "png:\Q$path\E"; |
|
|
184 | |
|
|
185 | # check if this is a wall. ultra-ugly. ultra-ultra-ugly. |
|
|
186 | if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { |
|
|
187 | my ($pfx, $dir, $sfx) = ($1, hex $2, $3); |
|
|
188 | #check for 0..F images to be sure(?) this is a wall |
|
|
189 | unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { |
|
|
190 | # add a 4px border and add other images around it |
|
|
191 | $CROP = "-shave 8x8 +repage"; |
|
|
192 | |
|
|
193 | $w += 8; |
|
|
194 | $h += 8; |
|
|
195 | |
|
|
196 | $SRC = "-size ${w}x${h} xc:transparent"; |
|
|
197 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
|
|
198 | |
|
|
199 | # 8 surrounding images |
|
|
200 | for ( |
|
|
201 | # x y b r0 r1 |
|
|
202 | [-1, -1, 0, 6], |
|
|
203 | [ 0, -1, 1, 10, 14], |
|
|
204 | [+1, -1, 0, 12], |
|
|
205 | |
|
|
206 | [-1, 0, 8, 5, 7], |
|
|
207 | # |
|
|
208 | [+1, 0, 2, 5, 13], |
|
|
209 | |
|
|
210 | [-1, +1, 0, 3], |
|
|
211 | [ 0, +1, 4, 10, 11], |
|
|
212 | [+1, +1, 0, 9], |
|
|
213 | ) { |
|
|
214 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
215 | $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", |
|
|
216 | "\Q$pfx", |
|
|
217 | ($dir & $d) ? $r1 : $r0, |
|
|
218 | "\Q$sfx", |
|
|
219 | $x * ($w - 8) + 4, |
|
|
220 | $y * ($h - 8) + 4; |
|
|
221 | } |
|
|
222 | } |
|
|
223 | } |
|
|
224 | |
| 177 | system "convert png:\Q$path\E -depth 8 rgba:-" |
225 | system "convert -depth 8 $SRC rgba:-" |
| 178 | . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" |
226 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
| 179 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" |
227 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
| 180 | and die "convert/hq2xa pipeline error: status $? ($!)"; |
228 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
| 181 | system $OPTIPNG, "-i0", "-q", "$other~"; |
229 | system $OPTIPNG, "-i0", "-q", "$other~"; |
| 182 | die "$other~ has zero size, aborting." unless -s "$other~"; |
230 | die "$other~ has zero size, aborting." unless -s "$other~"; |
| 183 | rename "$other~", $other; |
231 | rename "$other~", $other; |
| 184 | }; |
232 | }; |
| 185 | } |
233 | } |
| 186 | |
234 | |
| 187 | push @png, [$other, !$CACHE]; |
235 | push @c_png, [$other, !$CACHE]; |
| 188 | } |
236 | } |
| 189 | |
237 | |
| 190 | # possibly scale down |
238 | # possibly scale down |
| 191 | if (0 > aio_stat "$stem.32x32.png") { |
239 | if (0 > aio_stat "$stem.32x32.png") { |
| 192 | my $other = "$stem.32x32.png~"; |
240 | my $other = "$stem.32x32.png~"; |
| … | |
… | |
| 217 | rename "$other~", $other; |
265 | rename "$other~", $other; |
| 218 | }; |
266 | }; |
| 219 | } |
267 | } |
| 220 | |
268 | |
| 221 | #warn "scaled down $path to $other\n";#d# |
269 | #warn "scaled down $path to $other\n";#d# |
| 222 | push @png, [$other, !$CACHE]; |
270 | push @c_png, [$other, !$CACHE]; |
| 223 | } |
271 | } |
| 224 | } |
272 | } |
| 225 | |
273 | |
| 226 | (my $face = $stem) =~ s/^.*\///; |
274 | (my $face = $stem) =~ s/^.*\///; |
| 227 | |
275 | |
| … | |
… | |
| 288 | aio_unlink $path if $delete; |
336 | aio_unlink $path if $delete; |
| 289 | } |
337 | } |
| 290 | } |
338 | } |
| 291 | |
339 | |
| 292 | sub process_arc { |
340 | sub process_arc { |
| 293 | while (@arc) { |
341 | while (my $job = $c_arc->get) { |
| 294 | my ($dir, $file) = @{pop @arc}; |
342 | my ($dir, $file) = @$job; |
| 295 | |
343 | |
| 296 | my $arc; |
344 | my $arc; |
| 297 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
345 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 298 | |
346 | |
| 299 | my $arc = read_arch "$dir/$file"; |
347 | my $arc = read_arch "$dir/$file"; |
| … | |
… | |
| 356 | for my $face ($o->{face} || (), @{$anim || []}) { |
404 | for my $face ($o->{face} || (), @{$anim || []}) { |
| 357 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
405 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
| 358 | |
406 | |
| 359 | my $info = $FACEINFO{$face} ||= {}; |
407 | my $info = $FACEINFO{$face} ||= {}; |
| 360 | |
408 | |
|
|
409 | $info->{arc} = $o; |
| 361 | $info->{visibility} = $visibility if defined $visibility; |
410 | $info->{visibility} = $visibility if defined $visibility; |
| 362 | $info->{magicmap} = $magicmap if defined $magicmap; |
411 | $info->{magicmap} = $magicmap if defined $magicmap; |
| 363 | } |
412 | } |
| 364 | |
413 | |
| 365 | if (my $smooth = delete $o->{smoothface}) { |
414 | if (my $smooth = delete $o->{smoothface}) { |
| … | |
… | |
| 374 | } |
423 | } |
| 375 | } |
424 | } |
| 376 | } |
425 | } |
| 377 | |
426 | |
| 378 | sub process_trs { |
427 | sub process_trs { |
| 379 | while (@trs) { |
428 | while (my $job = $c_trs->get) { |
| 380 | my ($dir, $file) = @{pop @trs}; |
429 | my ($dir, $file) = @$job; |
| 381 | my $path = "$dir/$file"; |
430 | my $path = "$dir/$file"; |
| 382 | |
431 | |
| 383 | my $trs; |
432 | my $trs; |
| 384 | if (0 > aio_load $path, $trs) { |
433 | if (0 > aio_load $path, $trs) { |
| 385 | warn "$path: $!, skipping.\n"; |
434 | warn "$path: $!, skipping.\n"; |
| … | |
… | |
| 388 | |
437 | |
| 389 | $TRS .= $trs; |
438 | $TRS .= $trs; |
| 390 | } |
439 | } |
| 391 | } |
440 | } |
| 392 | |
441 | |
|
|
442 | my %FILECACHE; |
|
|
443 | |
|
|
444 | sub load_cached($;$) { |
|
|
445 | unless (exists $FILECACHE{$_[0]}) { |
|
|
446 | my $data; |
|
|
447 | if (0 < aio_load $_[0], $data) { |
|
|
448 | if ($_[1]) { |
|
|
449 | $data = eval { $_[1]->($data) }; |
|
|
450 | warn "$_[0]: $@" if $@; |
|
|
451 | } |
|
|
452 | } |
|
|
453 | |
|
|
454 | $FILECACHE{$_[0]} = $data; |
|
|
455 | } |
|
|
456 | |
|
|
457 | $FILECACHE{$_[0]} |
|
|
458 | } |
|
|
459 | |
| 393 | sub process_res { |
460 | sub process_res { |
| 394 | while (@res) { |
461 | while (my $job = $c_res->get) { |
| 395 | my ($dir, $file, $type) = @{pop @res}; |
462 | my ($dir, $file, $type) = @$job; |
| 396 | |
463 | |
| 397 | my $data; |
464 | my $data; |
| 398 | aio_load "$dir/$file", $data; |
465 | aio_load "$dir/$file", $data; |
| 399 | |
466 | |
| 400 | my $copyright; |
467 | my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; |
| 401 | aio_load "$dir/copyright", $copyright; |
468 | |
|
|
469 | next if $meta && !exists $meta->{$file}; |
|
|
470 | |
|
|
471 | $meta = { |
|
|
472 | %{ $meta->{"" } || {} }, |
|
|
473 | %{ $meta->{$file} || {} }, |
|
|
474 | }; |
|
|
475 | |
|
|
476 | if ($meta->{license} =~ s/^#//) { |
|
|
477 | $meta->{license} = ({ |
|
|
478 | "pd" => "Public Domain", |
|
|
479 | "gpl" => "GNU General Public License, version 3.0 or any later", |
|
|
480 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
481 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
|
|
482 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
|
|
483 | })->{$meta->{license}} |
|
|
484 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
|
|
485 | } |
| 402 | |
486 | |
| 403 | $file =~ s/\.res$//; |
487 | $file =~ s/\.res$//; |
| 404 | $file =~ /\.([^.]+)$/ |
488 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
| 405 | or next; |
|
|
| 406 | |
489 | |
| 407 | substr $dir, 0, 1 + length $PATH, ""; |
490 | substr $dir, 0, 1 + length $PATH, ""; |
| 408 | |
491 | |
| 409 | $RESOURCE{"$dir/$file"} = { |
492 | $RESOURCE{"$dir/$file"} = { |
| 410 | type => $type, |
493 | type => (delete $meta->{type}) || $type, |
| 411 | copyright => $copyright, |
|
|
| 412 | data => $data, |
494 | data => $data, |
| 413 | chksum => Digest::MD5::md5 $data, |
495 | chksum => (Digest::MD5::md5 $data), |
|
|
496 | %$meta ? (meta => $meta) : (), |
| 414 | }; |
497 | }; |
| 415 | } |
498 | } |
| 416 | } |
499 | } |
| 417 | |
500 | |
| 418 | sub find_files; |
501 | sub find_files; |
| … | |
… | |
| 429 | my $dir = $path; |
512 | my $dir = $path; |
| 430 | substr $dir, 0, 1 + length $PATH, ""; |
513 | substr $dir, 0, 1 + length $PATH, ""; |
| 431 | |
514 | |
| 432 | for my $file (@$nondirs) { |
515 | for my $file (@$nondirs) { |
| 433 | if ($dir =~ /^music(?:\/|$)/) { |
516 | if ($dir =~ /^music(?:\/|$)/) { |
| 434 | push @res, [$path, $file, 3] # FT_MUSIC |
517 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
| 435 | if $file =~ /\.(ogg)$/; |
518 | if $file =~ /\.(ogg)$/; |
| 436 | |
519 | |
| 437 | } elsif ($dir =~ /^sounds(?:\/|$)/) { |
520 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
| 438 | push @res, [$path, $file, 5] # FT_SOUND |
521 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
| 439 | if $file =~ /\.(wav|ogg)$/; |
522 | if $file =~ /\.(wav|ogg)$/; |
| 440 | |
523 | |
| 441 | } elsif ($dir =~ /^res(?:\/|$)/) { |
524 | } elsif ($dir =~ /^res(?:\/|$)/) { |
| 442 | push @res, [$path, $file, 0] # FT_FACE |
525 | $c_res->put ([$path, $file, 0]) # FT_FACE |
| 443 | if $file =~ /\.(jpg|png)$/; |
526 | if $file =~ /\.(jpg|png)$/; |
| 444 | push @res, [$path, $file, 7] # FT_RSRC |
527 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
| 445 | if $file =~ /\.(res)$/; |
528 | if $file =~ /\.(res)$/; |
| 446 | |
529 | |
| 447 | } elsif ($file =~ /\.png$/) { |
530 | } elsif ($file =~ /\.png$/) { |
| 448 | push @png, ["$path/$file", 0]; |
531 | push @c_png, ["$path/$file", 0]; |
| 449 | |
532 | |
| 450 | } elsif ($file =~ /\.trs$/) { |
533 | } elsif ($file =~ /\.trs$/) { |
| 451 | push @trs, [$path, $file]; |
534 | $c_trs->put ([$path, $file]); |
| 452 | |
535 | |
| 453 | } elsif ($file =~ /\.arc$/) { |
536 | } elsif ($file =~ /\.arc$/) { |
| 454 | push @arc, [$path, $file]; |
537 | $c_arc->put ([$path, $file]); |
| 455 | |
538 | |
| 456 | } else { |
539 | } else { |
| 457 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
540 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
| 458 | } |
541 | } |
| 459 | } |
542 | } |
| … | |
… | |
| 478 | if (!-d "$path/treasures") { |
561 | if (!-d "$path/treasures") { |
| 479 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
562 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 480 | exit 1 unless $FORCE; |
563 | exit 1 unless $FORCE; |
| 481 | } |
564 | } |
| 482 | |
565 | |
|
|
566 | print "scanning files...\n" if $VERBOSE; |
|
|
567 | |
| 483 | find_files $path; |
568 | find_files $path; |
|
|
569 | |
|
|
570 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
571 | my @a_res = map +(async \&process_res), 1..2; |
|
|
572 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
573 | |
| 484 | IO::AIO::flush; |
574 | IO::AIO::flush; |
| 485 | |
575 | |
| 486 | $_->join for ( |
576 | $c_res->put (undef) for @a_res; |
|
|
577 | $c_arc->put (undef) for @a_arc; |
|
|
578 | $c_trs->put (undef) for @a_trs; |
|
|
579 | |
|
|
580 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
581 | |
|
|
582 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
583 | |
|
|
584 | print "end arc, start png processing...\n" if $VERBOSE; |
|
|
585 | |
| 487 | # four png crunchers work fine for my 2x smp machine |
586 | # four png crunchers work fine for my 2x smp machine |
| 488 | (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), |
587 | my @a_png = map +(async \&process_png), 1..4; |
| 489 | (async \&process_trs), (async \&process_trs), |
|
|
| 490 | (async \&process_arc), (async \&process_arc), |
|
|
| 491 | (async \&process_res), (async \&process_res), |
|
|
| 492 | ); |
|
|
| 493 | |
588 | |
|
|
589 | $_->join for (@a_trs, @a_res, @a_png); |
|
|
590 | |
|
|
591 | print "scanning done, processing results...\n" if $VERBOSE; |
| 494 | { |
592 | { |
| 495 | # remove path prefix from editor_folder |
593 | # remove path prefix from editor_folder |
| 496 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
594 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
| 497 | for values %ARC; |
595 | for values %ARC; |
| 498 | |
596 | |
|
|
597 | print "resolving inheritance tree...\n" if $VERBOSE; |
| 499 | # resolve inherit |
598 | # resolve inherit |
| 500 | while () { |
599 | while () { |
| 501 | my $progress; |
600 | my $progress; |
| 502 | my $loop; |
601 | my $loop; |
| 503 | |
602 | |
| … | |
… | |
| 529 | } |
628 | } |
| 530 | |
629 | |
| 531 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
630 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
| 532 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
631 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
| 533 | |
632 | |
|
|
633 | print "writing archetypes...\n" if $VERBOSE; |
| 534 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
634 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 535 | or die "$DATADIR/archetypes~: $!"; |
635 | or die "$DATADIR/archetypes~: $!"; |
| 536 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
636 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 537 | } |
637 | } |
| 538 | |
638 | |
| 539 | { |
639 | { |
|
|
640 | print "writing treasures...\n" if $VERBOSE; |
| 540 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
641 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 541 | or die "$DATADIR/treasures~: $!"; |
642 | or die "$DATADIR/treasures~: $!"; |
| 542 | print $fh $TRS; |
643 | print $fh $TRS; |
| 543 | } |
644 | } |
| 544 | |
645 | |
| 545 | { |
646 | { |
|
|
647 | print "processing facedata...\n" if $VERBOSE; |
| 546 | while (my ($k, $v) = each %FACEINFO) { |
648 | while (my ($k, $v) = each %FACEINFO) { |
| 547 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
649 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
| 548 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
650 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
| 549 | |
651 | |
| 550 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
652 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
| … | |
… | |
| 555 | |
657 | |
| 556 | if (my $magicmap = $v->{magicmap}) { |
658 | if (my $magicmap = $v->{magicmap}) { |
| 557 | $magicmap =~ y/A-Z_\-/a-z/d; |
659 | $magicmap =~ y/A-Z_\-/a-z/d; |
| 558 | $v->{magicmap} = $COLOR{$magicmap}; |
660 | $v->{magicmap} = $COLOR{$magicmap}; |
| 559 | } |
661 | } |
| 560 | } |
|
|
| 561 | |
662 | |
|
|
663 | delete $v->{arc}; |
|
|
664 | } |
|
|
665 | |
|
|
666 | print "writing facedata...\n" if $VERBOSE; |
| 562 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
667 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
| 563 | or die "$DATADIR/facedata~: $!"; |
668 | or die "$DATADIR/facedata~: $!"; |
| 564 | |
669 | |
| 565 | print $fh freeze { |
670 | print $fh freeze { |
| 566 | version => 2, |
671 | version => 2, |
| 567 | faceinfo => \%FACEINFO, |
672 | faceinfo => \%FACEINFO, |
| 568 | animinfo => \%ANIMINFO, |
673 | animinfo => \%ANIMINFO, |
| 569 | resource => \%RESOURCE, |
674 | resource => \%RESOURCE, |
| 570 | }; |
675 | }; |
| 571 | } |
676 | } |
|
|
677 | |
|
|
678 | print "committing files...\n" if $VERBOSE; |
| 572 | |
679 | |
| 573 | for (qw(archetypes facedata treasures)) { |
680 | for (qw(archetypes facedata treasures)) { |
| 574 | chmod 0644, "$DATADIR/$_~"; |
681 | chmod 0644, "$DATADIR/$_~"; |
| 575 | rename "$DATADIR/$_~", "$DATADIR/$_" |
682 | rename "$DATADIR/$_~", "$DATADIR/$_" |
| 576 | or die "$DATADIR/$_: $!"; |
683 | or die "$DATADIR/$_: $!"; |
