diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-11-14 14:59:51 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-11-14 14:59:51 -0400 |
commit | 92f36a1d31418e747eeaaaad03aeb85cec939d21 (patch) | |
tree | 0013232fca756f278dd44fefc45a18a1a9d35289 /Utility | |
parent | 1b0e53cd9a1289c2eb7b3b29cb3804e3d61a8744 (diff) |
still can't express custom-setup deps
They need unix on non-windows, for Utility.Env, which Build.Configure uses,
but cabal can't express that in a custom-setup stanza.
To avoid this problem, Utility.Env would need to be moved into
unix-compat..
Diffstat (limited to 'Utility')
-rw-r--r-- | Utility/Env.hs | 24 | ||||
-rw-r--r-- | Utility/Env/Set.hs | 40 | ||||
-rw-r--r-- | Utility/Gpg.hs | 1 | ||||
-rw-r--r-- | Utility/Lsof.hs | 2 |
4 files changed, 25 insertions, 42 deletions
diff --git a/Utility/Env.hs b/Utility/Env.hs index dfebd9868..c56f4ec23 100644 --- a/Utility/Env.hs +++ b/Utility/Env.hs @@ -16,6 +16,7 @@ import Control.Applicative import Data.Maybe import Prelude import qualified System.Environment as E +import qualified System.SetEnv #else import qualified System.Posix.Env as PE #endif @@ -41,6 +42,29 @@ getEnvironment = PE.getEnvironment getEnvironment = E.getEnvironment #endif +{- Sets an environment variable. To overwrite an existing variable, + - overwrite must be True. + - + - On Windows, setting a variable to "" unsets it. -} +setEnv :: String -> String -> Bool -> IO () +#ifndef mingw32_HOST_OS +setEnv var val overwrite = PE.setEnv var val overwrite +#else +setEnv var val True = System.SetEnv.setEnv var val +setEnv var val False = do + r <- getEnv var + case r of + Nothing -> setEnv var val True + Just _ -> return () +#endif + +unsetEnv :: String -> IO () +#ifndef mingw32_HOST_OS +unsetEnv = PE.unsetEnv +#else +unsetEnv = System.SetEnv.unsetEnv +#endif + {- Adds the environment variable to the input environment. If already - present in the list, removes the old value. - diff --git a/Utility/Env/Set.hs b/Utility/Env/Set.hs deleted file mode 100644 index fd8d5140d..000000000 --- a/Utility/Env/Set.hs +++ /dev/null @@ -1,40 +0,0 @@ -{- portable environment variables - - - - Copyright 2013 Joey Hess <id@joeyh.name> - - - - License: BSD-2-clause - -} - -{-# LANGUAGE CPP #-} - -module Utility.Env.Set where - -#ifdef mingw32_HOST_OS -import qualified System.Environment as E -import qualified System.SetEnv -#else -import qualified System.Posix.Env as PE -#endif - -{- Sets an environment variable. To overwrite an existing variable, - - overwrite must be True. - - - - On Windows, setting a variable to "" unsets it. -} -setEnv :: String -> String -> Bool -> IO () -#ifndef mingw32_HOST_OS -setEnv var val overwrite = PE.setEnv var val overwrite -#else -setEnv var val True = System.SetEnv.setEnv var val -setEnv var val False = do - r <- getEnv var - case r of - Nothing -> setEnv var val True - Just _ -> return () -#endif - -unsetEnv :: String -> IO () -#ifndef mingw32_HOST_OS -unsetEnv = PE.unsetEnv -#else -unsetEnv = System.SetEnv.unsetEnv -#endif diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index cbe1e4f82..94d588cd7 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -15,7 +15,6 @@ import qualified Build.SysConfig as SysConfig import System.Posix.Types import qualified System.Posix.IO import Utility.Env -import Utility.Env.Set #endif import Utility.Tmp import Utility.Format (decode_c) diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs index d8f0deb32..e3ed709ec 100644 --- a/Utility/Lsof.hs +++ b/Utility/Lsof.hs @@ -11,7 +11,7 @@ module Utility.Lsof where import Common import Build.SysConfig as SysConfig -import Utility.Env.Set +import Utility.Env import System.Posix.Types |