Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Enno Rehling 2019-08-01 23:02:12 +02:00
parent 0bf1356e60 35476da96b
commit bcdddd5099
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clibs

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

4
process/compress.sh
View File

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

2
process/send-bz2-report
View File

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

4
process/send-zip-report
View File

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

6
process/sendreport.sh
View File

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

4
process/sendreports.sh
View File

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

4
scripts/run-turn.lua
View File

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