From a683a8ee7cf0f7670abbbf0b42ce29c64843577b Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Fri, 13 May 2022 21:09:27 +0200 Subject: [PATCH] Check neomutt version to adapt template accordingly --- roles/neomutt/tasks/main.yml | 4 ++++ roles/neomutt/templates/account.neomuttrc.j2 | 8 ++++++++ todo | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/roles/neomutt/tasks/main.yml b/roles/neomutt/tasks/main.yml index 77d9bcc..ffd4463 100644 --- a/roles/neomutt/tasks/main.yml +++ b/roles/neomutt/tasks/main.yml @@ -15,6 +15,10 @@ - neomutt when: ansible_facts['distribution'] == 'Debian' +- name: Get installed neomutt version + set_fact: + neomutt_version: "{{ lookup('pipe', 'neomutt -v') | regex_search('NeoMutt 20\\d{6}') | split | last }}" + - name: Create neomutt config directory file: path: ~/.config/neomutt diff --git a/roles/neomutt/templates/account.neomuttrc.j2 b/roles/neomutt/templates/account.neomuttrc.j2 index 223cf26..14f8768 100644 --- a/roles/neomutt/templates/account.neomuttrc.j2 +++ b/roles/neomutt/templates/account.neomuttrc.j2 @@ -6,7 +6,11 @@ set hostname = "{{ account.fulladdress.split('@') | last }}" #set sendmail = "msmtp -a {{ account.fulladdress }}" set smtp_pass = "`pass {{ account.passlocation }}`" set smtp_url = "{{ account.smtp.proto }}://{{ account.smtp.login }}@{{ account.smtp.server }}:{{ account.smtp.port }}" +{% if neomutt_version | int >= 20211015 %} set real_name = "{{ account.realname }}" +{% else %} +set realname = "{{ account.realname }}" +{% endif %} set from = "{{ account.fulladdress }}" set use_from = yes @@ -20,7 +24,11 @@ set folder = "~/.local/share/mail/{{ account.fulladdress }}" {% endif %} set header_cache = "~/.cache/neomutt/{{ account.fulladdress }}/headers" set mbox_type = Maildir +{% if neomutt_version | int >= 20211015 %} set spool_file = "{{ account.other_vars.spool_file | default('+INBOX') }}" +{% else %} +set spoolfile = "{{ account.other_vars.spool_file | default('+INBOX') }}" +{% endif %} set record = "{{ account.other_vars.record | default('+Sent') }}" set postponed = "{{ account.other_vars.postponed | default('+Drafts') }}" set trash = "{{ account.other_vars.trash | default('+Trash') }}" diff --git a/todo b/todo index 52cc81f..a168845 100644 --- a/todo +++ b/todo @@ -1,3 +1,2 @@ support multiple remotes in git clones add upstream to i3blocks-contrib repo -neomutt: prior to NeoMutt 2021-10-15, use realname and spoolfile, after, use real_name and spool_file