From ad1e45aaedee71fbae100d2d73ff56b6d09e1577 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 14 Nov 2017 14:25:46 -0400
Subject: split out setEnv to avoid adding dep
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Windows needs the setenv package in custom-setup, but I don't want to
pull it in on unix, which would probably break some builds and need more
work. Instead, split out setEnv to a separate module.

Quite likely, unix-compat will get a portable environment layer, and
then both modules can be removed from here.

This commit was sponsored by Øyvind Andersen Holm.
---
 Utility/Env.hs     | 24 ------------------------
 Utility/Env/Set.hs | 40 ++++++++++++++++++++++++++++++++++++++++
 Utility/Gpg.hs     |  1 +
 Utility/Lsof.hs    |  2 +-
 4 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 Utility/Env/Set.hs

(limited to 'Utility')

diff --git a/Utility/Env.hs b/Utility/Env.hs
index c56f4ec23..dfebd9868 100644
--- a/Utility/Env.hs
+++ b/Utility/Env.hs
@@ -16,7 +16,6 @@ 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
@@ -42,29 +41,6 @@ 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
new file mode 100644
index 000000000..fd8d5140d
--- /dev/null
+++ b/Utility/Env/Set.hs
@@ -0,0 +1,40 @@
+{- 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 94d588cd7..cbe1e4f82 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -15,6 +15,7 @@ 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 e3ed709ec..d8f0deb32 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
+import Utility.Env.Set
 
 import System.Posix.Types
 
-- 
cgit v1.2.3