diff --git a/.gitignore b/.gitignore index 8ae1608bb..24a918963 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ ipch/ *.opensdf *.pdb *.sdf -*.sh *.suo *.user @@ -41,4 +40,4 @@ Thumbs.db *.cfg *.cmd tmp/ -tests/config.lua +tests/config.lua diff --git a/process/compress.py b/process/compress.py index 2ad62d814..243f80d9c 100755 --- a/process/compress.py +++ b/process/compress.py @@ -3,7 +3,7 @@ from sys import argv, exit from string import join from os import access, R_OK -from os import system +from os import system, symlink gamename='Eressea' @@ -38,11 +38,8 @@ for line in infile.readlines(): if not options.has_key("reports"): continue reports = options["reports"].split(",") +# reports = reports + [ "iso.cr" ] prefix = "%(turn)s-%(faction)s." % options - files=[] - times="../parteien" - if os.path.isfile(times): - files = files + [ times ] if options["compression"]=="zip": output = prefix+"zip" files = [output] @@ -54,8 +51,9 @@ for line in infile.readlines(): filename = "%s%s" % (prefix, extension) if (access(filename, R_OK)): parameters = parameters + [ filename ] - system("zip %s -q -m -j -1 %s" % (output, join(parameters," "))) + system("zip %s -q -m -j %s" % (output, join(parameters," "))) else: + files = [] for extension in reports: if extension!='': filename = "%s%s" % (prefix, extension) @@ -66,7 +64,12 @@ for line in infile.readlines(): #print output, "exists, skipping" continue system("bzip2 %s" % filename) - #print files + if not access('../wochenbericht.txt'): + os.symlink('../parteien', '../wochenbericht.txt') + extras = [ '../wochenbericht.txt', '../express.txt' ] + for extra in extras: + if access(extra, R_OK): + files = files + [extra] options["files"] = join(files, " ") batch = file("%s.sh" % options["faction"], "w") batch.write(template % options) diff --git a/process/compress.sh b/process/compress.sh new file mode 100755 index 000000000..ff152b9f1 --- /dev/null +++ b/process/compress.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +if [ -z $ERESSEA ]; then + echo "You need to define the \$ERESSEA environment variable to run $0" + exit -2 +fi + +GAME=$ERESSEA/game-$1 +GAME_NAME=$(grep name $GAME/eressea.ini | sed 's/.*=\s*//') + +TURN=$2 +if [ -z $TURN ] +then + TURN=`cat $GAME/turn` +fi + +if [ ! -d $GAME/reports ]; then + echo "cannot find reports directory in $GAME" + exit -1 +fi + +cd $GAME/reports +$HOME/bin/compress.py $TURN "$GAME_NAME" +cd -