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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Enno Rehling 2019-07-06 12:08:14 +02:00
parent fdde7c8c44 7eb0e580a0
commit 5119579498
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
process/cron/orders.cron
View File

@ -11,10 +11,5 @@ fi
for GAME in $* for GAME in $*
do do
if [ "$GAME" == "eressea" ]; then GAME=2 ; fi $HOME/eressea/orders-php/check-orders.sh $GAME
if [ "$GAME" == "e3a" ]; then GAME=3 ; fi
if [ -e $HOME/eressea/game-$GAME/orders.queue ]
then
$HOME/bin/orders-process $GAME
fi
done done

2
process/orders-accept
View File

@ -22,5 +22,5 @@ filename=$(basename "$ACCEPT_FILE")
email="$ACCEPT_MAIL" email="$ACCEPT_MAIL"
if [ -d "$ERESSEA/orders-php" ] if [ -d "$ERESSEA/orders-php" ]
then then
php "$ERESSEA/orders-php/cli.php" insert "$filename" "$email" "$lang" php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
fi fi

2
src/automate.c
View File

@ -161,7 +161,7 @@ void autostudy_run(scholar scholars[], int nscholars)
} }
} }
#define MAXSCHOLARS 512 #define MAXSCHOLARS 1024
void do_autostudy(region *r) void do_autostudy(region *r)
{ {