summaryrefslogtreecommitdiff
path: root/src/Hakyll/Core/Configuration.hs
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2013-05-22 15:24:26 +0300
committerSimonas Kazlauskas <git@kazlauskas.me>2013-05-22 15:24:26 +0300
commit0a818d0725af6d5242d1545bf40a1eb532dfd1e5 (patch)
treecd4c0d3abf5b728d7fa1fdc5412e73338d3e6550 /src/Hakyll/Core/Configuration.hs
parent2ef7fee7978af45416634ae9a024523a2f6f0e10 (diff)
downloadhakyll-0a818d0725af6d5242d1545bf40a1eb532dfd1e5.tar.gz
Deploy should propagate error code
And return 1 if neither deployCommand and deploySite is set.
Diffstat (limited to 'src/Hakyll/Core/Configuration.hs')
-rw-r--r--src/Hakyll/Core/Configuration.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Hakyll/Core/Configuration.hs b/src/Hakyll/Core/Configuration.hs
index 70a7a1c..790badc 100644
--- a/src/Hakyll/Core/Configuration.hs
+++ b/src/Hakyll/Core/Configuration.hs
@@ -12,6 +12,7 @@ import Control.Monad (void)
import Data.Default (Default (..))
import Data.List (isPrefixOf, isSuffixOf)
import System.Directory (canonicalizePath)
+import System.Exit (ExitCode)
import System.FilePath (isAbsolute, normalise, takeFileName)
import System.IO.Error (catchIOError)
import System.Process (system)
@@ -65,7 +66,7 @@ data Configuration = Configuration
-- The 'Configuration' object is passed as a parameter to this
-- function.
--
- deploySite :: Configuration -> IO ()
+ deploySite :: Configuration -> IO ExitCode
, -- | Use an in-memory cache for items. This is faster but uses more
-- memory.
inMemoryCache :: Bool
@@ -84,8 +85,8 @@ defaultConfiguration = Configuration
, tmpDirectory = "_cache/tmp"
, providerDirectory = "."
, ignoreFile = ignoreFile'
- , deployCommand = "echo 'No deploy command specified'"
- , deploySite = void . system . deployCommand
+ , deployCommand = "echo 'No deploy command specified' && exit 1"
+ , deploySite = system . deployCommand
, inMemoryCache = True
}
where