From ca44e643a472f7a55fcd8d4deeceebef0679b723 Mon Sep 17 00:00:00 2001
From: Jorge Israel Peña <jorge.israel.p@gmail.com>
Date: Sun, 27 Apr 2014 15:55:33 -0700
Subject: Minor refactor of PR #233

OS won't change mid-execution, so lets avoid the unnecessary
check each time `unixFilter` is run.
---
 src/Hakyll/Core/UnixFilter.hs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/Hakyll/Core')

diff --git a/src/Hakyll/Core/UnixFilter.hs b/src/Hakyll/Core/UnixFilter.hs
index fd3c335..edc8eac 100644
--- a/src/Hakyll/Core/UnixFilter.hs
+++ b/src/Hakyll/Core/UnixFilter.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 --------------------------------------------------------------------------------
 -- | A Compiler that supports unix filters.
 module Hakyll.Core.UnixFilter
@@ -19,7 +21,6 @@ import           System.Exit             (ExitCode (..))
 import           System.IO               (Handle, hClose, hFlush, hGetContents,
                                           hPutStr, hSetEncoding, localeEncoding)
 import           System.Process
-import qualified System.Info             as System
 
 --------------------------------------------------------------------------------
 import           Hakyll.Core.Compiler
@@ -105,17 +106,19 @@ unixFilterIO :: Monoid o
              -> i
              -> IO (o, String, ExitCode)
 unixFilterIO writer reader programName args input = do
-    -- The problem on Windows is that `proc` is that it is unable to execute
+    -- The problem on Windows is that `proc` is unable to execute
     -- batch stubs (eg. anything created using 'gem install ...') even if its in
     -- `$PATH`. A solution to this issue is to execute the batch file explicitly
     -- using `cmd /c batchfile` but there is no rational way to know where said
     -- batchfile is on the system. Hence, we detect windows using the
-    -- `System.Info` module and then instead of using `proc` to create the
-    -- process, use `shell` instead which will be able to execute everything
-    -- `proc` can, and this can deal with batch files as well.
-    let pr = if System.os == "mingw32"
-                 then shell $ unwords (programName : args)
-                 else proc programName args
+    -- CPP and instead of using `proc` to create the process, use `shell`
+    -- which will be able to execute everything `proc` can
+    -- as well as batch files.
+#ifdef mingw32_HOST_OS
+    let pr = shell $ unwords (programName : args)
+#else
+    let pr = proc programName args
+#endif
 
     (Just inh, Just outh, Just errh, pid) <-
         createProcess pr
-- 
cgit v1.2.3