From f2cb2f5be97ff975fbd8794b8da7576a311c66ca Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Sat, 25 Feb 2023 17:12:27 +0100
Subject: [PATCH] imapfilter: Switch to use pass command

The other office tools use the pass command so we switch this one to use
it to unify invocation.
---
 office/.config/imapfilter/accounts.lua            | 8 ++++----
 office/.config/imapfilter/filters/rollup-dump.lua | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/office/.config/imapfilter/accounts.lua b/office/.config/imapfilter/accounts.lua
index 7589f85..8d48286 100644
--- a/office/.config/imapfilter/accounts.lua
+++ b/office/.config/imapfilter/accounts.lua
@@ -1,9 +1,9 @@
 local accounts = {}
 
-local status, gmailuser = pipe_from(
-                              'gpg2 --decrypt --no-tty --quiet --no-verbose --for-your-eyes-only --pinentry-mode ask ~/.local/share/pass/misc/aerc-gmail-app-password.gpg | grep username | cut -d: -f2')
-local status, gmailpass = pipe_from(
-                              'gpg2 --decrypt --no-tty --quiet --no-verbose --for-your-eyes-only --pinentry-mode ask ~/.local/share/pass/misc/aerc-gmail-app-password.gpg | head -n1')
+local _, gmailuser = pipe_from(
+    'pass show misc/gmail-app-password | grep username | cut -d: -f2')
+local _, gmailpass = pipe_from(
+    'pass show misc/gmail-app-password | head -n1')
 -- Setup an imap account called gmail
 accounts.gmail = IMAP {
     server = "imap.gmail.com",
diff --git a/office/.config/imapfilter/filters/rollup-dump.lua b/office/.config/imapfilter/filters/rollup-dump.lua
index 7b1ef95..e26f9bb 100644
--- a/office/.config/imapfilter/filters/rollup-dump.lua
+++ b/office/.config/imapfilter/filters/rollup-dump.lua
@@ -30,11 +30,11 @@ function getSenderList(rollupfile)
         for line in file:lines() do table.insert(rollupSenders, line) end
     else
         print(
-            "ERROR: rollup did not find rollup.txt file containing mail addresses at " ..
-                rollupfile or "")
+            "rollup did not find rollup.txt file containing mail addresses at " ..
+            rollupfile or ". Skipping.")
     end
     return rollupSenders
 end
 
 sendToFolder(accounts.gmail["Inbox"], accounts.gmail["Dump"],
-             getSenderList(getRollupFile()))
+    getSenderList(getRollupFile()))