From 428f8b4812da35fb93ff3330b692ddabcb8b2ff0 Mon Sep 17 00:00:00 2001
From: Yannik Enss <me@adnidor.de>
Date: Wed, 23 Feb 2022 18:38:23 +0100
Subject: [PATCH] fix template formatting

---
 generator.conf        | 20 ++++++++++++--------
 list_termine_proto.sh |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/generator.conf b/generator.conf
index 33c32ab..ae0309b 100644
--- a/generator.conf
+++ b/generator.conf
@@ -45,17 +45,21 @@ post_tops:
       Wo: {{place}} \linebreak
       Redeleitung: ? \linebreak
       Protokoll: ?'
-      protostub: '* Termin: {{next_date.strftime("%d.%m.%Y")}}
-      
-* Ort: {{place}}
+      protostub: '{{"{{"}}NextFsr
 
-* nächste Redeleitung: XXXXXXXX
+| termin = {{next_date.strftime("%d.%m.%Y")}}  {{time.strftime("%H:%M")}}
 
-* nächstes Protokoll: XXXXXXXX'
+| ort = {{place}}
+
+| redeleitung = XXXXXXXX
+
+| protokoll = XXXXXXXX
+
+{{"}}"}}'
     - title: Termine
       file: "data/termine.txt"
-      #command: "./list_termine.sh" # if khal is setup correctly, uncomment this to read events from there
-      #proto_command: "./list_termine_proto.sh"
+      command: "./list_termine.sh" # if khal is setup correctly, uncomment this to read events from there
+      proto_command: "./list_termine_proto.sh"
       protostub: '{|
 
 {{"{{"}}Termin|was=AAAAAAAAAA|wann=XX.YY.{{"}}"}}
@@ -84,7 +88,7 @@ protoreplace:
 
 Beschlussvorlage"
 
-sendmail: ["/usr/sbin/sendmail"]
+sendmail: ["/usr/bin/msmtp"]
 
 
 # vim: filetype=yaml
diff --git a/list_termine_proto.sh b/list_termine_proto.sh
index f89fc59..00f8bf9 100755
--- a/list_termine_proto.sh
+++ b/list_termine_proto.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-echo "{{'{{'}}"
+echo "{{'{|'}}"
 khal list --day-format "" --format "{{{{'{{{{'}}}}Termin|was={title}|wann={start}{{{{'}}}}'}}}}" -a calendars_fsmi today 30d | grep -v Fachschaftsrat
-echo "{{'}}'}}"
+echo "{{'|}'}}"