--- deliantra/server/utils/cfutil.in 2007/07/10 16:24:00 1.37 +++ deliantra/server/utils/cfutil.in 2007/07/16 19:49:34 1.41 @@ -94,7 +94,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"; @@ -394,6 +394,9 @@ my $data; aio_load "$dir/$file", $data; + my $copyright; + aio_load "$dir/copyright", $copyright; + $file =~ s/\.res$//; $file =~ /\.([^.]+)$/ or next; @@ -404,7 +407,7 @@ $RESOURCE{"$dir/$file"} = { type => $1, - copyright => "", # TODO + copyright => $copyright, data => $data, chksum => Digest::MD5::md5 $data, }; @@ -429,7 +432,7 @@ push @trs, [$path, $file]; } elsif ($file =~ /\.arc$/) { push @arc, [$path, $file]; - } elsif ($file =~ /\.(ogg|res)$/) { + } elsif ($file =~ /\.(ogg|jpg|res)$/) { push @res, [$path, $file]; } else { warn "ignoring $path/$file\n" if $VERBOSE >= 3;