From c998770a88ea6e4889a4caf949dce7b69697c35e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 16 Dec 2017 19:39:56 +0100
Subject: [PATCH 1/3] use find instead of ls to get list of order files. this
 addresses the problem leading to bug 2394.

Conflicts:
	process/create-orders
---
 process/create-orders | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/process/create-orders b/process/create-orders
index b0ca292f4..b1b738d50 100755
--- a/process/create-orders
+++ b/process/create-orders
@@ -16,13 +16,15 @@ else
   mv orders.dir orders.dir.$TURN
   mkdir -p orders.dir
 fi
-ls -1rt orders.dir.$TURN/turn-* | xargs cat > orders.$TURN
+find "orders.dir.$TURN" -maxdepth 1 -type f -printf "%T+\t%p\n" | sort | cut -f2 | while read
+do
+  cat "$REPLY" >> "orders.$TURN"
+done
 
 lockfile -r3 -l120 orders.queue.lock
 if [ -e orders.queue ] ; then
-  mv orders.queue orders.dir.$TURN/orders.queue
+  mv orders.queue "orders.dir.$TURN/orders.queue"
 fi
 rm -f orders.queue.lock
-fi
 
 

From ec961a89041f3bb427ce79152fb7ab8a730089a5 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 16 Dec 2017 21:16:51 +0100
Subject: [PATCH 2/3] shellcheck fixes

---
 process/create-orders | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/process/create-orders b/process/create-orders
index b1b738d50..707a89737 100755
--- a/process/create-orders
+++ b/process/create-orders
@@ -16,7 +16,7 @@ else
   mv orders.dir orders.dir.$TURN
   mkdir -p orders.dir
 fi
-find "orders.dir.$TURN" -maxdepth 1 -type f -printf "%T+\t%p\n" | sort | cut -f2 | while read
+find "orders.dir.$TURN" -maxdepth 1 -type f -printf "%T+\t%p\n" | sort | cut -f2 | while read -r
 do
   cat "$REPLY" >> "orders.$TURN"
 done

From d47bee5572f5ba909bd57c019f2414f20713c3fc Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 29 Dec 2017 21:01:50 +0100
Subject: [PATCH 3/3] christmas 2017

---
 scripts/eressea/xmas.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/eressea/xmas.lua b/scripts/eressea/xmas.lua
index b728c9976..6f319a316 100644
--- a/scripts/eressea/xmas.lua
+++ b/scripts/eressea/xmas.lua
@@ -2,6 +2,7 @@ if not config.xmas or config.xmas==0 then return nil end
 
 local gifts = {
     e2 = {
+        { year = 2017, turn = 1057, item = 'snowglobe', msg='santa_f' },
         { year = 2015, turn = 959, item = 'snowglobe', msg='santa_f' },
         { year = 2009, turn = 624, item = 'xmastree' },
         { year = 2006, turn = 468, key = 'xm06', item = 'snowman' },