on master help sign in
Changed System.Posix.Env (specifically 'getEnv') to System.Environment
ee20876Jonathan Osser
src/Graphics/Vty/Config.hs+4−4
@@ -87,7 +87,7 @@ import Graphics.Vty.Input.Events
87import GHC.Generics
87import GHC.Generics
88
88
89import System.Directory (getAppUserDataDirectory)
89import System.Directory (getAppUserDataDirectory)
90−import System.Posix.Env (getEnv)
90+import System.Environment (lookupEnv)
91import System.Posix.IO (stdInput, stdOutput)
91import System.Posix.IO (stdInput, stdOutput)
92import System.Posix.Types (Fd(..))
92import System.Posix.Types (Fd(..))
93
93
@@ -176,20 +176,20 @@ instance Monoid Config where
176userConfig :: IO Config
176userConfig :: IO Config
177userConfig = do
177userConfig = do
178 configFile <- (mappend <$> getAppUserDataDirectory "vty" <*> pure "/config") >>= parseConfigFile
178 configFile <- (mappend <$> getAppUserDataDirectory "vty" <*> pure "/config") >>= parseConfigFile
179− overrideConfig <- maybe (return defaultConfig) parseConfigFile =<< getEnv "VTY_CONFIG_FILE"
179+ overrideConfig <- maybe (return defaultConfig) parseConfigFile =<< lookupEnv "VTY_CONFIG_FILE"
180 let base = configFile <> overrideConfig
180 let base = configFile <> overrideConfig
181 mappend base <$> overrideEnvConfig
181 mappend base <$> overrideEnvConfig
182
182
183overrideEnvConfig :: IO Config
183overrideEnvConfig :: IO Config
184overrideEnvConfig = do
184overrideEnvConfig = do
185− d <- getEnv "VTY_DEBUG_LOG"
185+ d <- lookupEnv "VTY_DEBUG_LOG"
186 return $ defaultConfig { debugLog = d }
186 return $ defaultConfig { debugLog = d }
187
187
188-- | Configures VTY using defaults suitable for terminals. This function
188-- | Configures VTY using defaults suitable for terminals. This function
189-- can raise 'VtyConfigurationError'.
189-- can raise 'VtyConfigurationError'.
190standardIOConfig :: IO Config
190standardIOConfig :: IO Config
191standardIOConfig = do
191standardIOConfig = do
192− mb <- getEnv "TERM"
192+ mb <- lookupEnv "TERM"
193 case mb of
193 case mb of
194 Nothing -> throwIO VtyMissingTermEnvVar
194 Nothing -> throwIO VtyMissingTermEnvVar
195 Just t ->
195 Just t ->
test/VerifyOutput.hs+1−1
@@ -13,7 +13,7 @@ import Verify.Graphics.Vty.Output
13import Control.Monad
13import Control.Monad
14
14
15import qualified System.Console.Terminfo as Terminfo
15import qualified System.Console.Terminfo as Terminfo
16−import System.Posix.Env
16+-- import System.Posix.Env
17import System.Posix.IO
17import System.Posix.IO
18
18
19tests :: IO [Test]
19tests :: IO [Test]