Merge remote-tracking branch 'upstream/develop' into develop

process/compress.py

@@ -2,8 +2,8 @@
 
 from sys import argv, exit
 from string import join
-from os import access, R_OK
+import os
-from os import system, symlink
+import os.path
 
 gamename='Eressea'
 
@@ -43,15 +43,13 @@ for line in infile.readlines():
     if options["compression"]=="zip":
         output = prefix+"zip"
         files = [output]
-        if (access(output, R_OK)):
+        if not os.path.isfile(output):
-            pass
-        else:
             parameters = []
             for extension in reports:
                 filename = "%s%s" % (prefix, extension)
-                if (access(filename, R_OK)):
+                if os.path.isfile(filename):
                     parameters = parameters + [ filename ]
-            system("zip %s -q -m -j %s" % (output, join(parameters," ")))
+            os.system("zip %s -q -m -j %s" % (output, join(parameters," ")))
     else:
         files = []
         for extension in reports:
@@ -59,16 +57,13 @@ for line in infile.readlines():
                 filename = "%s%s" % (prefix, extension)
                 output = "%s%s.bz2" % (prefix, extension)
                 files = files+[output]
-                if access(filename, R_OK):
+                if os.path.isfile(filename):
-                    if (access(output, R_OK)):
+                    if os.path.isfile(output):
-                        #print output, "exists, skipping"
                         continue
-                    system("bzip2 %s" % filename)
+                    os.system("bzip2 %s" % filename)
-    if not access('../wochenbericht.txt'):
-        os.symlink('../parteien', '../wochenbericht.txt')
     extras = [ '../wochenbericht.txt', '../express.txt' ]
     for extra in extras:
-        if access(extra, R_OK):
+        if os.path.isfile(extra):
             files = files + [extra]
     options["files"] = join(files, " ")
     batch = file("%s.sh" % options["faction"], "w")

process/cron/crontab

@@ -2,7 +2,6 @@
 
 PATH=/home/eressea/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin
 ERESSEA=/home/eressea/eressea
-ATLANTIS=/home/eressea/atlantis
 ENABLED=yes
 PREVIEW=yes
 CONFIRM=yes
@@ -14,5 +13,5 @@ CONFIRM=yes
 15 21 * * Sat        [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 3
 25 21 * * Sat        [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 4
 35 21 * * Sat        [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 2
-39 08 * * Sun        [ "$PREVIEW" = "yes" ] && $ERESSEA/server/bin/preview.cron
+30 07 * * Sun        [ "$PREVIEW" = "yes" ] && $ERESSEA/server/bin/preview.cron
 */5 * * * *          [ "$CONFIRM" = "yes" ] && $ERESSEA/server/bin/orders.cron 2 3 4

process/cron/run-eressea.cron

@@ -40,6 +40,5 @@ fi
 echo "sending reports for game $GAME, turn $TURN"
 $BIN/compress.sh $GAME $TURN
 $BIN/sendreports.sh $GAME
-[ $GAME -lt 4 ] && $BIN/send-summary $GAME
 $BIN/backup-eressea $GAME $TURN
 rm -f test/execute.lock

s/install

@@ -27,6 +27,6 @@ install -v $ROOT/process/$prg $DEST/bin/
 done
 
 # install crontab, but only on the eressea server:
-HOST=`hostname`
+# in fact, never do this, because it overwrites hand-edits
-
+#WHOAMI=`whoami`@`hostname`
-[ "gruenbaer" = "$HOST" ] && crontab $ROOT/process/cron/crontab
+#[ "eressea@gruenbaer" = "$WHOAMI" ] && crontab $ROOT/process/cron/crontab

scripts/eressea/cursed.lua

@@ -12,8 +12,6 @@ local function curse(file)
         elseif not bitset(f.flags, 16) then
             print("cursing " .. tostring(f))
             f.flags = f.flags + 16
-        else
-            print("already cursed: " .. tostring(f))
         end
     end
 end

src/buildno.h

@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 6
+#define VERSION_MINOR 7
-#define VERSION_BUILD 3
+#define VERSION_BUILD 0