Move (osIsWindows :: Bool) into Constants

mgsloan · mgsloan · commit a08ecada0520 · 2018-01-31T23:29:04.000+01:00
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -768,12 +768,6 @@ isOwnedByUser path = liftIO $ do
             fileStatus <- getFileStatus (toFilePath path)
             user <- getEffectiveUserID
             return (user == fileOwner fileStatus)
-  where
-#ifdef WINDOWS
-    osIsWindows = True
-#else
-    osIsWindows = False
-#endif
 
 -- | 'True' if we are currently running inside a Docker container.
 getInContainer :: (MonadIO m) => m Bool
diff --git a/src/Stack/Constants.hs b/src/Stack/Constants.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
@@ -32,6 +33,7 @@ module Stack.Constants
     ,minTerminalWidth
     ,maxTerminalWidth
     ,defaultTerminalWidth
+    ,osIsWindows
     )
     where
 
@@ -241,3 +243,12 @@ maxTerminalWidth = 200
 -- automatically detect it and when the user doesn't supply one.
 defaultTerminalWidth :: Int
 defaultTerminalWidth = 100
+
+-- | True if using Windows OS.
+osIsWindows :: Bool
+osIsWindows =
+#ifdef WINDOWS
+  True
+#else
+  False
+#endif
diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs
@@ -16,6 +16,7 @@ import qualified Data.Text                  as T
 import           Path
 import           Path.IO
 import qualified Stack.Build
+import           Stack.Constants            (osIsWindows)
 import           Stack.GhcPkg               (ghcPkgExeName)
 import           Stack.Options.ScriptParser
 import           Stack.Runners
@@ -122,17 +123,10 @@ scriptCmd opts go' = do
     wordsComma = splitWhen (\c -> c == ' ' || c == ',')
 
     toExeName fp =
-      if isWindows
+      if osIsWindows
         then replaceExtension fp "exe"
         else dropExtension fp
 
-isWindows :: Bool
-#ifdef WINDOWS
-isWindows = True
-#else
-isWindows = False
-#endif
-
 getPackagesFromModuleInfo
   :: ModuleInfo
   -> FilePath -- ^ script filename
