From 62953174b4615316f09e46779eef844abf8e3167 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 2 Jun 2019 10:39:07 +0200
Subject: [PATCH] drop xdg-basedir dependency

---
 Main.hs    | 13 ++++++-------
 bisc.cabal |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Main.hs b/Main.hs
index 47ef2cb..1bbd0d5 100644
--- a/Main.hs
+++ b/Main.hs
@@ -9,15 +9,14 @@ import Data.Configurator
 import Control.Monad        (mapM_, filterM)
 import Control.Monad.Reader (ReaderT, runReaderT, asks)
 import System.FilePath      (joinPath, takeBaseName, (</>))
-import System.Directory     (removeFile, getDirectoryContents, doesFileExist)
 import System.IO            (readFile)
+import System.Directory
 
 import Database.Selda
 import Database.Selda.SQLite
 
-import qualified Data.Text    as T
-import qualified Data.Text.IO as T
-import qualified System.Environment.XDG.BaseDir as X
+import qualified Data.Text        as T
+import qualified Data.Text.IO     as T
 
 
 data Settings = Settings
@@ -38,7 +37,7 @@ type Action = ReaderT Settings IO
 
 main :: IO ()
 main = do
-  config   <- X.getUserConfigFile "bisc" "bisc.conf"
+  config   <- getXdgDirectory XdgConfig ("bisc" </> "bisc.conf")
   settings <- loadSettings config
   runReaderT clean settings
 
@@ -112,8 +111,8 @@ deleteData whitelist = do
 
 loadSettings :: FilePath -> IO Settings
 loadSettings path = do
-  configdir <- X.getUserConfigDir "qutebrowser"
-  datadir   <- X.getUserDataDir   "qutebrowser"
+  configdir <- getXdgDirectory XdgConfig "qutebrowser"
+  datadir   <- getXdgDirectory XdgData   "qutebrowser"
   let
    defaultWhitelist = joinPath [configdir, "whitelists", "cookies"]
    defaultWebengine = joinPath [datadir, "webengine"]
diff --git a/bisc.cabal b/bisc.cabal
index 50e5fa9..c7be5fb 100644
--- a/bisc.cabal
+++ b/bisc.cabal
@@ -25,8 +25,8 @@ executable bisc
   main-is:             Main.hs
   build-depends:       base ==4.* , selda ==0.3.*,
                        selda-sqlite ==0.1.*,
-                       xdg-basedir, filepath, directory,
-                       text, mtl, configurator
+                       filepath, directory, text,
+                       mtl, configurator
   default-language:    Haskell2010
   default-extensions:  DeriveGeneric, OverloadedStrings
                        OverloadedLabels, FlexibleContexts