mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid needing PartialPrelude

Browse source
This commit is contained in:
Joey Hess 2016-09-22 11:29:53 -04:00
parent ece88889a7
commit 4f7a50f27d
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Utility/FreeDesktop.hs
View file

@ -31,7 +31,6 @@ module Utility.FreeDesktop (
import Utility.Exception import Utility.Exception
import Utility.UserInfo import Utility.UserInfo
import Utility.Process import Utility.Process
import Utility.PartialPrelude
import Utility.Directory import Utility.Directory
import System.Environment import System.Environment
@ -135,7 +134,9 @@ userConfigDir = xdgEnvHome "CONFIG_HOME" ".config"
userDesktopDir :: IO FilePath userDesktopDir :: IO FilePath
userDesktopDir = maybe fallback return =<< (parse <$> xdg_user_dir) userDesktopDir = maybe fallback return =<< (parse <$> xdg_user_dir)
where 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"] xdg_user_dir = catchMaybeIO $ readProcess "xdg-user-dir" ["DESKTOP"]
fallback = xdgEnvHome "DESKTOP_DIR" "Desktop" fallback = xdgEnvHome "DESKTOP_DIR" "Desktop"