juergen/eressea-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patch original run-eressea.cron instead of duplicating script

Browse Source
This commit is contained in:
Jürgen Holly
2020-12-13 15:47:34 +01:00
parent 2c1f147c67
commit adbcc3492a
3 changed files with 32 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
docker-assets/run-eressea.cron.patch Normal file
View File

@ -0,0 +1,29 @@
--- /eressea/server/bin/run-eressea.cron 2020-12-12 15:09:21.000000000 +0000
+++ /eressea/run-eressea.sh 2020-12-07 21:09:58.000000000 +0000
@@ -1,7 +1,12 @@
#!/bin/bash
+# this script is based on run-eressea.cron
+# differences to original
+# it is possible to run a turn with empty orders
+
eval "$(luarocks path)"
GAME=$1
+ENABLE_EMPTY_ORDERS=$2
(
[ "$ENABLED" == "no" ] && exit
[ -z "$ERESSEA" ] && ERESSEA="$HOME/eressea"
@@ -27,8 +32,10 @@
"$BIN/create-orders" "$GAME" "$TURN"
if [ ! -s "$ERESSEA/game-$GAME/orders.$TURN" ]; then
- echo "server did not create orders for turn $TURN in game $GAME"
- exit 2
+ if [ "$ENABLE_EMPTY_ORDERS" != "yes" ]; then
+ echo "server did not create orders for turn $TURN in game $GAME"
+ exit 2
+ fi
fi
"$BIN/backup-eressea" "$GAME" "$TURN"

62
docker-assets/run-eressea.sh
View File

@ -1,62 +0,0 @@
#!/bin/bash
# this script is based on run-eressea.cron
# differences to original
# it is possible to run a turn with empty orders
eval "$(luarocks path)"
GAME=$1
ENABLE_EMPTY_ORDERS=$2
(
[ "$ENABLED" == "no" ] && exit
[ -z "$ERESSEA" ] && ERESSEA="$HOME/eressea"
export ERESSEA
BIN="$ERESSEA/server/bin"
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"
if [ -d "$REPORTS" ]; then
rm -rf "$REPORTS"
fi
mkdir "$REPORTS"
cd "$ERESSEA/game-$GAME" || exit
if [ -d test ]; then
touch test/execute.lock
fi
"$BIN/create-orders" "$GAME" "$TURN"
if [ ! -s "$ERESSEA/game-$GAME/orders.$TURN" ]; then
if [ "$ENABLE_EMPTY_ORDERS" != "yes" ]; then
echo "server did not create orders for turn $TURN in game $GAME"
exit 2
fi
fi
"$BIN/backup-eressea" "$GAME" "$TURN"
rm -f execute.lock
"$BIN/run-turn" "$GAME" "$TURN"
touch execute.lock
if [ ! -s "$REPORTS/reports.txt" ]; then
echo "server did not create reports.txt in game $GAME"
exit 4
fi
"$BIN/backup-eressea" "$GAME" "$TURN"
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
fi
echo "sending reports for game $GAME, turn $TURN"
"$BIN/compress.sh" "$GAME" "$TURN"
"$BIN/sendreports.sh" "$GAME"
"$BIN/backup-eressea" "$GAME" "$TURN"
rm -f test/execute.lock
) | tee -a "$HOME/log/eressea.cron.log"