Merge branch 'develop' of github.com:ennorehling/eressea into develop

clibs

@@ -1 +1 @@
-Subproject commit 6965050165efdae89305a13bff06283229f143f4
+Subproject commit 1854780fe3073e491775836c22f709668b1fff62

process/compress.sh

@@ -2,7 +2,7 @@
 
 if [ -z "$ERESSEA" ]; then
   echo "You need to define the \$ERESSEA environment variable to run $0"
-  exit -2
+  exit 2
 fi
 
 GAME="$ERESSEA/game-$1"
@@ -16,7 +16,7 @@ fi
 
 if [ ! -d "$GAME/reports" ]; then
   echo "cannot find reports directory in $GAME"
-  exit -1
+  exit 1
 fi
 
 cd "$GAME/reports" || exit

process/send-bz2-report

@@ -5,7 +5,7 @@ if [ -z "$ERESSEA" ]; then
 fi
 if [ ! -f reports.txt ]; then
   echo "need to run $0 from the report direcory"
-  exit -2
+  exit 2
 fi
 
 TEMPLATE=report-mail.txt

process/send-zip-report

@@ -6,7 +6,7 @@ if [ -z "$ERESSEA" ]; then
 fi
 if [ ! -f reports.txt ]; then
   echo "need to run $0 from the report direcory"
-  exit -2
+  exit 2
 fi
 
 PWD=$(pwd)
@@ -33,7 +33,7 @@ fi
 
 if [ ! -e "$TEMPLATE" ]; then
   echo "no such email template: $TEMPLATE"
-  exit -3
+  exit 3
 fi
 
 while [ -e /tmp/.stopped ] ; do

process/sendreport.sh

@@ -3,14 +3,14 @@
 
 if [ -z "$ERESSEA" ]; then
   echo "You have to define the \$ERESSEA environment variable to run $0"
-  exit -2
+  exit 2
 fi
 
 function abort() {
   if [ $# -gt 0 ]; then
     echo "$@"
   fi
-  exit -1
+  exit 1
 }
 
 GAME=$1
@@ -47,7 +47,7 @@ fi
 bash "${FACTION}.sh" "$EMAIL" || reply "Unbekannte Partei $FACTION"
 
 OWNER=$("$BIN/getfaction.py" "$PWFILE" "$FACTION")
-if [ ! -z "$OWNER" ]; then
+if [ -n "$OWNER" ]; then
   echo "Der Report Deiner Partei wurde an ${EMAIL} gesandt." \
   | mutt -s "Reportnachforderung Partei ${FACTION}" "$OWNER"
 fi

process/sendreports.sh

@@ -5,10 +5,10 @@
 
 if [ -z "$ERESSEA" ]; then
   echo "You have to define the \$ERESSEA environment variable to run $0"
-  exit -2
+  exit 2
 fi
 
-if [ ! -z "$1" ]; then
+if [ -n "$1" ]; then
   GAME="$ERESSEA/game-$1"
 else
   GAME=$ERESSEA

scripts/run-turn.lua

@@ -95,11 +95,11 @@ local function write_htpasswd()
 end
 
 local function write_files(locales)
+    write_reports()
+    write_summary()
     write_database()
     write_passwords()
     write_htpasswd()
-    write_reports()
-    write_summary()
 end
 
 local function write_scores()