avoid warnings about not exported System.Directory.isSymbolicLink

10 files changed, 8 insertions, 10 deletions

diff --git a/Build/Configure.hs b/Build/Configure.hs
index f0c3f7c33..ec3f4ccc4 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -4,7 +4,6 @@
 
 module Build.Configure where
 
-import System.Directory hiding (isSymbolicLink)
 import Control.Applicative
 import System.Environment (getArgs)
 import Control.Monad.IfElse
@@ -20,6 +19,7 @@ import Utility.Env
 import Utility.Exception
 import qualified Git.Version
 import Utility.DottedVersion
+import Utility.Directory
 
 tests :: [TestCase]
 tests =
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index f832f310c..0203c02a6 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -15,12 +15,12 @@ import Utility.Exception
 import Utility.FreeDesktop
 import Utility.Path
 import Utility.Monad
+import Utility.Directory
 import Config.Files
 import Utility.OSX
 import Assistant.Install.AutoStart
 import Assistant.Install.Menu
 
-import System.Directory hiding (isSymbolicLink)
 import System.Environment
 #ifndef mingw32_HOST_OS
 import System.Posix.User
diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs
index 37885296f..94e399dfe 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -15,7 +15,6 @@ import Text.Parsec
 import Text.Parsec.String
 import Control.Applicative ((<$>))
 import Control.Monad
-import System.Directory hiding (isSymbolicLink)
 import Data.Maybe
 import Data.List
 
@@ -23,6 +22,7 @@ import Utility.Monad
 import Utility.Process hiding (env)
 import qualified Utility.Process
 import Utility.Env
+import Utility.Directory
 
 data CmdParams = CmdParams
 	{ cmd :: String
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index dc71a992c..cfdcc3a6f 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -39,7 +39,6 @@ import Data.String.Utils
 import Data.Char
 import System.Environment
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import System.IO
 import Control.Monad
 import Prelude hiding (log)
@@ -49,6 +48,7 @@ import Utility.Misc
 import Utility.Exception hiding (try)
 import Utility.Path
 import Utility.FileSystemEncoding
+import Utility.Directory
 
 data Coord = Coord
 	{ coordLine :: Int
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 81cf834ef..3bc79fed4 100644
--- a/Build/LinuxMkLibs.hs
+++ b/Build/LinuxMkLibs.hs
@@ -12,7 +12,6 @@ module Main where
 import System.Environment
 import Data.Maybe
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Data.List
 import System.Posix.Files
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index b8c988062..7ce470bc9 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -21,7 +21,6 @@
 {-# LANGUAGE OverloadedStrings, FlexibleContexts #-}

 

 import Development.NSIS

-import System.Directory hiding (isSymbolicLink)

 import System.FilePath

 import Control.Monad

 import Control.Applicative

@@ -36,6 +35,7 @@ import Utility.CopyFile
 import Utility.SafeCommand

 import Utility.Process

 import Utility.Exception

+import Utility.Directory

 import Build.BundledPrograms

 

 main = do

diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index 8be73babe..948b0d5a3 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -10,7 +10,6 @@ module Main where
 import System.Environment (getArgs)
 import Data.Maybe
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Control.Monad.IfElse
 import Data.List
diff --git a/Build/Standalone.hs b/Build/Standalone.hs
index 48e96f952..5cb09cd60 100644
--- a/Build/Standalone.hs
+++ b/Build/Standalone.hs
@@ -12,12 +12,12 @@ module Main where
 import Control.Monad.IfElse
 import System.Environment
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Control.Monad
 import Build.BundledPrograms
 
 import Utility.SafeCommand
 import Utility.Path
+import Utility.Directory
 
 progDir :: FilePath -> FilePath
 #ifdef darwin_HOST_OS
diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs
index b7766d6c4..79979c5fb 100644
--- a/Build/TestConfig.hs
+++ b/Build/TestConfig.hs
@@ -7,10 +7,10 @@ module Build.TestConfig where
 import Utility.Path
 import Utility.Monad
 import Utility.SafeCommand
+import Utility.Directory
 
 import System.IO
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 
 type ConfigKey = String
 data ConfigValue =
diff --git a/Build/Version.hs b/Build/Version.hs
index fb6366688..87315b0ea 100644
--- a/Build/Version.hs
+++ b/Build/Version.hs
@@ -6,7 +6,6 @@ module Build.Version where
 
 import Data.List
 import System.Environment
-import System.Directory hiding (isSymbolicLink)
 import Data.Char
 import System.Process
 import Control.Applicative
@@ -14,6 +13,7 @@ import Prelude
 
 import Utility.Monad
 import Utility.Exception
+import Utility.Directory
 
 type Version = String