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

Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2020-06-26 22:51:57 +02:00
parent 14f4750411 de40103a2e
commit bd407c5401
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
process/create-orders
View File

@ -16,12 +16,9 @@ else
mv orders.dir "orders.dir.$TURN" mv orders.dir "orders.dir.$TURN"
mkdir -p orders.dir mkdir -p orders.dir
fi fi
rm -f "orders.$TURN"
find "orders.dir.$TURN" -maxdepth 1 -regextype posix-extended -regex "orders.dir.$TURN/(turn|upload)-.*" -type f -printf "%T+\t%p\n" | sort | cut -f2 | while read -r
do
tr -d '\r' < "$REPLY" >> "orders.$TURN"
done
rm -f "orders.$TURN"
php ../../orders-php/cli.php -d "orders.dir.$TURN/orders.db" export | tr -d '\r' > "../orders.$TURN"
lockfile -r3 -l120 orders.queue.lock lockfile -r3 -l120 orders.queue.lock
if [ -e orders.queue ] ; then if [ -e orders.queue ] ; then
mv orders.queue "orders.queue.bak.$TURN" mv orders.queue "orders.queue.bak.$TURN"