forked from github/server
* Dateinamen der Reports geändert.
This commit is contained in:
parent
8df7894084
commit
d7184e744d
|
@ -2752,7 +2752,7 @@ reports(void)
|
||||||
addresses = get_addresses(f, seen);
|
addresses = get_addresses(f, seen);
|
||||||
if (!nonr && (f->options & wants_report))
|
if (!nonr && (f->options & wants_report))
|
||||||
{
|
{
|
||||||
sprintf(buf, "%s/%s.nr", reportpath(), factionid(f));
|
sprintf(buf, "%s/%d-%s.nr", reportpath(), turn, factionid(f));
|
||||||
F = cfopen(buf, "wt");
|
F = cfopen(buf, "wt");
|
||||||
if (F) {
|
if (F) {
|
||||||
report(F, f, addresses, pzTime);
|
report(F, f, addresses, pzTime);
|
||||||
|
@ -2762,7 +2762,7 @@ reports(void)
|
||||||
}
|
}
|
||||||
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
||||||
{
|
{
|
||||||
sprintf(buf, "%s/%s.cr", reportpath(), factionid(f));
|
sprintf(buf, "%s/%d-%s.cr", reportpath(), turn, factionid(f));
|
||||||
F = cfopen(buf, "wt");
|
F = cfopen(buf, "wt");
|
||||||
if (F) {
|
if (F) {
|
||||||
report_computer(F, f, seen, addresses, ltime);
|
report_computer(F, f, seen, addresses, ltime);
|
||||||
|
@ -2785,12 +2785,12 @@ reports(void)
|
||||||
if (f->no > 0 && f->options & wants_compressed) {
|
if (f->no > 0 && f->options & wants_compressed) {
|
||||||
|
|
||||||
if(f->age == 1) {
|
if(f->age == 1) {
|
||||||
fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n",
|
fprintf(BAT, "ls %d-%s.nr %d-%s.cr | zip -m -j -9 -@ %s.zip\n",
|
||||||
factionid(f), factionid(f), factionid(f));
|
turn, factionid(f), turn, factionid(f), factionid(f));
|
||||||
fprintf(BAT, "zip -j -9 %s.zip ../res/%s/%s/welcome.txt\n", factionid(f), global.welcomepath, locale_name(f->locale));
|
fprintf(BAT, "zip -j -9 %d-%s.zip ../res/%s/%s/welcome.txt\n", turn, factionid(f), global.welcomepath, locale_name(f->locale));
|
||||||
} else {
|
} else {
|
||||||
fprintf(BAT, "ls %s.nr %s.cr | zip -m -j -9 -@ %s.zip\n",
|
fprintf(BAT, "ls %d-%s.nr %d-%s.cr | zip -m -j -9 -@ %d-%s.zip\n",
|
||||||
factionid(f), factionid(f), factionid(f));
|
turn, factionid(f), turn, factionid(f), factionid(f));
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%s-%d.zip\" "
|
fprintf(shfp, "eresseamail.zipped $addr \"%s %s\" \"%s-%d.zip\" "
|
||||||
|
@ -2803,8 +2803,8 @@ reports(void)
|
||||||
" \\\n\t\"text/plain\" \"Willkommen\" ../res/%s/%s/welcome.txt", global.welcomepath, locale_name(f->locale));
|
" \\\n\t\"text/plain\" \"Willkommen\" ../res/%s/%s/welcome.txt", global.welcomepath, locale_name(f->locale));
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(BAT, "bzip2 -9v `ls %s.nr %s.cr`\n",
|
fprintf(BAT, "bzip2 -9v `ls 5D-%s.nr %d-%s.cr`\n",
|
||||||
factionid(f), factionid(f));
|
turn, factionid(f), turn, factionid(f));
|
||||||
|
|
||||||
fprintf(shfp, "eresseamail.bzip2 $addr \"%s %s\"", global.gamename, gamedate_short());
|
fprintf(shfp, "eresseamail.bzip2 $addr \"%s %s\"", global.gamename, gamedate_short());
|
||||||
|
|
||||||
|
@ -2815,13 +2815,13 @@ reports(void)
|
||||||
|
|
||||||
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
||||||
fprintf(shfp,
|
fprintf(shfp,
|
||||||
" \\\n\t\"application/x-bzip2\" \"Computer-Report\" %s.cr.bz2",
|
" \\\n\t\"application/x-bzip2\" \"Computer-Report\" %d-%s.cr.bz2",
|
||||||
factionid(f));
|
turn, factionid(f));
|
||||||
#ifdef USE_MERIAN
|
#ifdef USE_MERIAN
|
||||||
if (!nomer && f->options & wants_merian)
|
if (!nomer && f->options & wants_merian)
|
||||||
fprintf(shfp,
|
fprintf(shfp,
|
||||||
" \\\n\t\"application/x-bzip2\" \"Merian-Karte\" %s.mer.bz2",
|
" \\\n\t\"application/x-bzip2\" \"Merian-Karte\" %d-%s.mer.bz2",
|
||||||
factionid(f));
|
turn, factionid(f));
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -2834,13 +2834,13 @@ reports(void)
|
||||||
|
|
||||||
if (!nonr && f->options & wants_report)
|
if (!nonr && f->options & wants_report)
|
||||||
fprintf(shfp,
|
fprintf(shfp,
|
||||||
" \\\n\t\"text/plain\" \"Report\" %s.nr",
|
" \\\n\t\"text/plain\" \"Report\" turn, %s.nr",
|
||||||
factionid(f));
|
turn, factionid(f));
|
||||||
|
|
||||||
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
if (!nocr && (f->options & wants_computer_report || f->age<3))
|
||||||
fprintf(shfp,
|
fprintf(shfp,
|
||||||
" \\\n\t\"text/x-eressea-cr\" \"Computer-Report\" %s.cr",
|
" \\\n\t\"text/x-eressea-cr\" \"Computer-Report\" %d-%s.cr",
|
||||||
factionid(f));
|
turn, factionid(f));
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email);
|
fprintf(BAT, ". %s.sh %s\n", factionid(f), f->email);
|
||||||
|
|
Loading…
Reference in New Issue