From 4f7a50f27da14fff66e33427611afd9b8206addf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Sep 2016 11:29:53 -0400 Subject: [PATCH] avoid needing PartialPrelude --- Utility/FreeDesktop.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs index 67f6219bd1..9863198dbe 100644 --- a/Utility/FreeDesktop.hs +++ b/Utility/FreeDesktop.hs @@ -31,7 +31,6 @@ module Utility.FreeDesktop ( import Utility.Exception import Utility.UserInfo import Utility.Process -import Utility.PartialPrelude import Utility.Directory import System.Environment @@ -135,7 +134,9 @@ userConfigDir = xdgEnvHome "CONFIG_HOME" ".config" userDesktopDir :: IO FilePath userDesktopDir = maybe fallback return =<< (parse <$> xdg_user_dir) where - parse = maybe Nothing (headMaybe . lines) + parse s = case lines <$> s of + Just (l:_) -> Just l + _ -> Nothing xdg_user_dir = catchMaybeIO $ readProcess "xdg-user-dir" ["DESKTOP"] fallback = xdgEnvHome "DESKTOP_DIR" "Desktop" -- 2.30.2