forked from github/server
delete obsolete scripts, shellcheck the rest
This commit is contained in:
parent
45ec4b56df
commit
d6b57fc818
|
@ -14,9 +14,10 @@ if [ -z "$ERESSEA" ] ; then
|
||||||
echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
|
echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $ERESSEA
|
cd "$ERESSEA" || exit
|
||||||
|
|
||||||
for GAME in $*
|
for GAME in "$@"
|
||||||
do
|
do
|
||||||
orders-php/check-orders.sh $GAME
|
orders-php/check-orders.sh "$GAME"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
[ "$PREVIEW" != "yes" ] && exit
|
[ "$PREVIEW" != "yes" ] && exit
|
||||||
[ -z "${ERESSEA}" ] && ERESSEA="$HOME/eressea"
|
[ -z "${ERESSEA}" ] && ERESSEA="$HOME/eressea"
|
||||||
|
|
||||||
eval $(luarocks path)
|
eval "$(luarocks path)"
|
||||||
branch="develop"
|
branch="develop"
|
||||||
if [ -e "${ERESSEA}/build/.preview" ]; then
|
if [ -e "${ERESSEA}/build/.preview" ]; then
|
||||||
branch=$(cat "${ERESSEA}/build/.preview")
|
branch=$(cat "${ERESSEA}/build/.preview")
|
||||||
|
|
|
@ -1,55 +1,55 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
eval $(luarocks path)
|
eval "$(luarocks path)"
|
||||||
GAME=$1
|
GAME=$1
|
||||||
(
|
(
|
||||||
[ "$ENABLED" != "yes" ] && exit
|
[ "$ENABLED" == "no" ] && exit
|
||||||
[ -z ${ERESSEA} ] && ERESSEA=$HOME/eressea
|
[ -z "$ERESSEA" ] && ERESSEA="$HOME/eressea"
|
||||||
|
|
||||||
export ERESSEA
|
export ERESSEA
|
||||||
BIN=$ERESSEA/server/bin
|
BIN="$ERESSEA/server/bin"
|
||||||
TURN=$(cat $ERESSEA/game-$GAME/turn)
|
TURN=$(cat "$ERESSEA/game-$GAME/turn")
|
||||||
if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then
|
if [ ! -e "$ERESSEA/game-$GAME/data/$TURN.dat" ]; then
|
||||||
echo "data file $TURN is missing, cannot run turn for game $GAME"
|
echo "data file $TURN is missing, cannot run turn for game $GAME"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
REPORTS=$ERESSEA/game-$GAME/reports
|
REPORTS="$ERESSEA/game-$GAME/reports"
|
||||||
if [ -d $REPORTS ]; then
|
if [ -d "$REPORTS" ]; then
|
||||||
rm -rf $REPORTS
|
rm -rf "$REPORTS"
|
||||||
fi
|
fi
|
||||||
mkdir $REPORTS
|
mkdir "$REPORTS"
|
||||||
|
|
||||||
cd $ERESSEA/game-$GAME
|
cd "$ERESSEA/game-$GAME" || exit
|
||||||
|
|
||||||
if [ -d test ]; then
|
if [ -d test ]; then
|
||||||
touch test/execute.lock
|
touch test/execute.lock
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$BIN/create-orders $GAME $TURN
|
"$BIN/create-orders" "$GAME" "$TURN"
|
||||||
if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
|
if [ ! -s "$ERESSEA/game-$GAME/orders.$TURN" ]; then
|
||||||
echo "server did not create orders for turn $TURN in game $GAME"
|
echo "server did not create orders for turn $TURN in game $GAME"
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$BIN/backup-eressea $GAME $TURN
|
"$BIN/backup-eressea" "$GAME" "$TURN"
|
||||||
rm -f execute.lock
|
rm -f execute.lock
|
||||||
$BIN/run-turn $GAME $TURN
|
"$BIN/run-turn" "$GAME" "$TURN"
|
||||||
touch execute.lock
|
touch execute.lock
|
||||||
|
|
||||||
if [ ! -s $REPORTS/reports.txt ]; then
|
if [ ! -s "$REPORTS/reports.txt" ]; then
|
||||||
echo "server did not create reports.txt in game $GAME"
|
echo "server did not create reports.txt in game $GAME"
|
||||||
exit 4
|
exit 4
|
||||||
fi
|
fi
|
||||||
$BIN/backup-eressea $GAME $TURN
|
"$BIN/backup-eressea" "$GAME" "$TURN"
|
||||||
let TURN=$TURN+1
|
let TURN=$TURN+1
|
||||||
if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
|
if [ ! -s "$ERESSEA/game-$GAME/data/$TURN.dat" ]; then
|
||||||
echo "server did not create data for turn $TURN in game $GAME"
|
echo "server did not create data for turn $TURN in game $GAME"
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
echo "sending reports for game $GAME, turn $TURN"
|
echo "sending reports for game $GAME, turn $TURN"
|
||||||
$BIN/compress.sh $GAME $TURN
|
"$BIN/compress.sh" "$GAME" "$TURN"
|
||||||
$BIN/sendreports.sh $GAME
|
"$BIN/sendreports.sh" "$GAME"
|
||||||
$BIN/backup-eressea $GAME $TURN
|
"$BIN/backup-eressea" "$GAME" "$TURN"
|
||||||
rm -f test/execute.lock
|
rm -f test/execute.lock
|
||||||
) | tee -a $HOME/log/eressea.cron.log
|
) | tee -a "$HOME/log/eressea.cron.log"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
SCRIPT=$(readlink -f $0)
|
SCRIPT=$(readlink -f "$0")
|
||||||
cd $(dirname $SCRIPT)
|
SCRDIR=$(dirname "$SCRIPT")
|
||||||
|
cd "$SCRDIR" || exit
|
||||||
|
|
||||||
lockfile -r3 -l120 orders.queue.lock
|
lockfile -r3 -l120 orders.queue.lock
|
||||||
python process-orders.py "$@"
|
python process-orders.py "$@"
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ls -1 orders.dir/turn* | sed -e 's/.*turn-\(.*\),gruenbaer.*/\1/' | sort -u
|
|
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
grep -hiw ERESSEA orders.dir/turn-* | cut -d\ -f2 | sort -u
|
|
Loading…
Reference in New Issue