summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--roles/edit/templates/emacsconf-edit.el2
-rw-r--r--roles/prerec/tasks/main.yml1
-rwxr-xr-xroles/prerec/templates/update-task-status.sh6
3 files changed, 5 insertions, 4 deletions
diff --git a/roles/edit/templates/emacsconf-edit.el b/roles/edit/templates/emacsconf-edit.el
index b659121..6ca3efa 100644
--- a/roles/edit/templates/emacsconf-edit.el
+++ b/roles/edit/templates/emacsconf-edit.el
@@ -85,4 +85,4 @@
(find-file "{{ emacsconf_private_dir }}/conf.org")
(emacsconf-add-org-after-todo-state-change-hook)
-(emacsconf-erc-connect)
+(unless noninteractive (emacsconf-erc-connect))
diff --git a/roles/prerec/tasks/main.yml b/roles/prerec/tasks/main.yml
index c635693..032e3d2 100644
--- a/roles/prerec/tasks/main.yml
+++ b/roles/prerec/tasks/main.yml
@@ -27,3 +27,4 @@
- update-task-status.sh
- upload.sh
- publish-backstage-index.sh
+ - update-emacsconf.sh
diff --git a/roles/prerec/templates/update-task-status.sh b/roles/prerec/templates/update-task-status.sh
index c9ac142..d2500e1 100755
--- a/roles/prerec/templates/update-task-status.sh
+++ b/roles/prerec/templates/update-task-status.sh
@@ -3,8 +3,8 @@
SLUG="$1"
FROM_STATUS="$2"
TO_STATUS="$3"
-cd ~/emacsconf-2022-private
+cd {{ emacsconf_private_dir }}
git pull
-emacsclient -a emacs --eval "(progn (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\") (emacsconf-with-talk-heading \"$SLUG\" (emacsconf-cache-video-data (emacsconf-get-talk-info-for-subtree)) (save-buffer)))"
-git commit -m "Update task status for $SLUG" conf.org
+emacsclient -a emacs --eval "(emacsconf-with-todo-hooks (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\"))"
+git commit -m "Update task status for $SLUG from $FROM_STATUS to $TO_STATUS" conf.org
git push