avoid warnings about not exported System.Directory.isSymbolicLink

Annex/Fixup.hs

@@ -20,7 +20,6 @@ import Utility.Exception
 
 import System.IO
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Control.Monad
 import Control.Monad.IfElse

Assistant/Install/AutoStart.hs

@@ -14,7 +14,7 @@ import Utility.FreeDesktop
 #ifdef darwin_HOST_OS
 import Utility.OSX
 import Utility.Path
-import System.Directory hiding (isSymbolicLink)
+import Utility.Directory
 #endif
 
 installAutoStart :: FilePath -> FilePath -> IO ()

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 =

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

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

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

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

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

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

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

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 =

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
 

Common.hs

@@ -14,7 +14,6 @@ import Data.Monoid as X
 import Data.Default as X
 
 import System.FilePath as X
-import System.Directory as X hiding (isSymbolicLink)
 import System.IO as X hiding (FilePath)
 #ifndef mingw32_HOST_OS
 import System.Posix.IO as X hiding (createPipe)

Setup.hs

@@ -12,7 +12,7 @@ import Distribution.Verbosity (Verbosity)
 import System.FilePath
 import Control.Applicative
 import Control.Monad
-import System.Directory hiding (isSymbolicLink)
+import System.Directory
 import Data.List
 import Control.Exception
 

Utility/Directory.hs

@@ -6,9 +6,12 @@
  -}
 
 {-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -fno-warn-tabs #-}
+{-# OPTIONS_GHC -fno-warn-tabs -w #-}
 
-module Utility.Directory where
+module Utility.Directory (
+	module Utility.Directory,
+	module System.Directory
+) where
 
 import System.IO.Error
 import System.Directory hiding (isSymbolicLink)

Utility/FreeDesktop.hs

@@ -33,9 +33,9 @@ import Utility.Path
 import Utility.UserInfo
 import Utility.Process
 import Utility.PartialPrelude
+import Utility.Directory
 
 import System.Environment
-import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List
 import Data.String.Utils

Utility/LinuxMkLibs.hs

@@ -14,7 +14,6 @@ import Utility.Monad
 import Utility.Path
 
 import Data.Maybe
-import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List.Utils
 import System.Posix.Files

Utility/LockFile/PidLock.hs

@@ -34,7 +34,6 @@ import Data.List
 import Network.BSD
 import System.FilePath
 import Data.Hash.MD5
-import System.Directory hiding (isSymbolicLink)
 import Control.Applicative
 import Prelude
 

Utility/Path.hs

@@ -12,7 +12,6 @@ module Utility.Path where
 
 import Data.String.Utils
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Data.Maybe
 import Data.Char
@@ -29,6 +28,7 @@ import Utility.Exception
 import qualified "MissingH" System.Path as MissingH
 import Utility.Monad
 import Utility.UserInfo
+import Utility.Directory
 
 {- Simplifies a path, removing any "." component, collapsing "dir/..", 
  - and removing the trailing path separator.

Utility/Tmp.hs

@@ -11,9 +11,9 @@
 module Utility.Tmp where
 
 import System.IO
-import System.Directory hiding (isSymbolicLink)
 import Control.Monad.IfElse
 import System.FilePath
+import System.Directory
 import Control.Monad.IO.Class
 #ifndef mingw32_HOST_OS
 import System.Posix.Temp (mkdtemp)