on master help sign in
Merge pull request #168 from Supernerd11/lookupEnv

Changed System.Posix.Env (specifically 'getEnv') to System.Environment

commitfc958607184312839589a4f6e427695be680fb2e authorJonathan Daugherty <cygnus@foobox.com> dateSat 23 Feb 2019, 08:40 (8 years ago) parent38948b40a41207
2 files changed+4−5
src/Graphics/Vty/Config.hs+4−4 test/VerifyOutput.hs−1
src/Graphics/Vty/Config.hs+4−4
@@ -87,7 +87,7 @@ import Graphics.Vty.Input.Events
8787import GHC.Generics
8888
8989import System.Directory (getAppUserDataDirectory)
90−import System.Posix.Env (getEnv)
90+import System.Environment (lookupEnv)
9191import System.Posix.IO (stdInput, stdOutput)
9292import System.Posix.Types (Fd(..))
9393
@@ -176,20 +176,20 @@ instance Monoid Config where
176176userConfig :: IO Config
177177userConfig = do
178178 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"
180180 let base = configFile <> overrideConfig
181181 mappend base <$> overrideEnvConfig
182182
183183overrideEnvConfig :: IO Config
184184overrideEnvConfig = do
185− d <- getEnv "VTY_DEBUG_LOG"
185+ d <- lookupEnv "VTY_DEBUG_LOG"
186186 return $ defaultConfig { debugLog = d }
187187
188188-- | Configures VTY using defaults suitable for terminals. This function
189189-- can raise 'VtyConfigurationError'.
190190standardIOConfig :: IO Config
191191standardIOConfig = do
192− mb <- getEnv "TERM"
192+ mb <- lookupEnv "TERM"
193193 case mb of
194194 Nothing -> throwIO VtyMissingTermEnvVar
195195 Just t ->
test/VerifyOutput.hs−1
@@ -13,7 +13,6 @@ import Verify.Graphics.Vty.Output
1313import Control.Monad
1414
1515import qualified System.Console.Terminfo as Terminfo
16−import System.Posix.Env
1716import System.Posix.IO
1817
1918tests :: IO [Test]