From 5c70c45b50f043fb8aacb96c4fc7df4dd7dca3f9 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 10 May 2014 22:33:46 +0200
Subject: [PATCH] read famililars equipment from separate file

---
 game-e2/config.xml       | 1 +
 game-e3/config.xml       | 1 +
 process/cron/run-eressea | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game-e2/config.xml b/game-e2/config.xml
index 72c1563ab..1696f8f58 100644
--- a/game-e2/config.xml
+++ b/game-e2/config.xml
@@ -20,6 +20,7 @@
   <xi:include href="config:///core/ships.xml"/>
   <xi:include href="config:///core/common/buildings.xml"/>
   <xi:include href="config:///core/equipment.xml"/>
+  <xi:include href="config:///core/familiars.xml"/>
   <xi:include href="config:///core/terrains.xml"/>
   <xi:include href="config:///game/terrains.xml"/>
   <xi:include href="config:///default/directions.xml"/>
diff --git a/game-e3/config.xml b/game-e3/config.xml
index 5b3ea01bc..84c2f4685 100644
--- a/game-e3/config.xml
+++ b/game-e3/config.xml
@@ -13,6 +13,7 @@
   <xi:include href="config:///core/prefixes.xml"/>
   <xi:include href="config:///core/common/buildings.xml"/>
   <xi:include href="config:///core/equipment.xml"/>
+  <xi:include href="config:///core/familiars.xml"/>
 
   <xi:include href="config:///game/ships.xml"/>
   <xi:include href="config:///game/shipnames.xml"/>
diff --git a/process/cron/run-eressea b/process/cron/run-eressea
index afd019018..d8627efcb 100755
--- a/process/cron/run-eressea
+++ b/process/cron/run-eressea
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 GAME=$1
 BIN=$HOME/bin
 export ERESSEA=$HOME/eressea
 export PATH
-TURN=$(cat $ERESSEA/game-$GAME)
+TURN=$(cat $ERESSEA/game-$GAME/turn)
 if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then
   echo "data file $TURN is missing, cannot run turn for game $GAME"
   exit 1
 fi
-$REPORTS=$ERESSEA/game-$GAME/reports
+REPORTS=$ERESSEA/game-$GAME/reports
 if [ -d $REPORTS ]; then
   rm -rf $REPORTS
 fi
@@ -18,7 +18,7 @@ if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
   echo "server did not create orders for turn $TURN in game $GAME"
   exit 2
 fi
-LET TURN=$TURN+1
+let TURN=$TURN+1
 if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
   echo "server did not create data for turn $TURN in game $GAME"
   exit 3