From 8c20a4668d812aeb7834003301e3c8379c6f0f69 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Sat, 31 Dec 2022 22:33:33 -0500
Subject: [PATCH] ENH use bracket dbus for xmobar tests

---
 bin/xmobar.hs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/xmobar.hs b/bin/xmobar.hs
index 936a01c..026d474 100644
--- a/bin/xmobar.hs
+++ b/bin/xmobar.hs
@@ -46,7 +46,7 @@ main = getArgs >>= parse
 parse :: [String] -> IO ()
 parse [] = run
 parse ["--deps"] = withCache printDeps
-parse ["--test"] = void $ withCache . evalConfig =<< connectDBus
+parse ["--test"] = withCache $ withDBus_ evalConfig
 parse _ = usage
 
 run :: IO ()
@@ -66,11 +66,13 @@ evalConfig db = do
   return $ config bf ifs ios cs d
 
 printDeps :: FIO ()
-printDeps = do
-  db <- io connectDBus
-  let ps = sort $ nub $ fmap showFulfillment $ concatMap dumpFeature $ allFeatures db
-  io $ mapM_ (putStrLn . T.unpack) ps
-  io $ disconnectDBus db
+printDeps = withDBus_ $ \db ->
+  mapM_ (liftIO . putStrLn . T.unpack) $
+    sort $
+      nub $
+        fmap showFulfillment $
+          concatMap dumpFeature $
+            allFeatures db
 
 usage :: IO ()
 usage =