1 files changed, 3 insertions, 5 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index cbbbf33..c2e5ead 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -211,7 +211,7 @@ data KeyRingRuntime = KeyRingRuntime
                         }
 
 -- | TODO: Packet Update should have deletiong action
---         and any other kind of roster entry level
+--         and any other kind of roster-entry level
 --         action.
 data PacketUpdate = InducerSignature String [SignatureSubpacket]
 
@@ -1708,10 +1708,8 @@ getHomeDir protohome = do
         return $ KikiSuccess (homedir,secring,pubring,workingkey)
  where
     envhomedir opt = do
-        gnupghome <- lookupEnv (homevar home) >>=
-                  \d -> return $ d >>= guard . (/="") >> d
-        homed <- flip fmap getHomeDirectory $
-                  \d -> fmap (const d) $ guard (d/="")
+        gnupghome <- fmap (mfilter (/="")) $ lookupEnv (homevar home)
+        homed <- fmap (mfilter (/="") . Just) getHomeDirectory
         let homegnupg = (++('/':(appdir home))) <$> homed
         let val = (opt `mplus` gnupghome `mplus` homegnupg)
         return $ val