summaryrefslogtreecommitdiff
path: root/src/Propellor/DotDir.hs
diff options
context:
space:
mode:
authorJoey Hess2016-04-02 12:05:07 -0400
committerJoey Hess2016-04-02 12:07:12 -0400
commitecf786ddab0161a4f5fa84e07cced60efb1595cd (patch)
tree37d77302fc57a274d30f392fdca8e8cd1c284f24 /src/Propellor/DotDir.hs
parentdb2d46246c5772c12aa8cf64ea604b65d164a7b0 (diff)
got rid of build flag to detect stack
Diffstat (limited to 'src/Propellor/DotDir.hs')
-rw-r--r--src/Propellor/DotDir.hs20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index 43067417..21479cb1 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
module Propellor.DotDir where
import Propellor.Message
@@ -53,14 +51,11 @@ dotPropellor = do
home <- myHomeDir
return (home </> ".propellor")
-data InitCfg = UseCabal | UseStack
-
-initCfg :: InitCfg
-#ifdef USE_STACK
-initCfg = UseStack
-#else
-initCfg = UseCabal
-#endif
+-- Detect if propellor was built using stack. This is somewhat of a hack.
+buildSystem :: IO String
+buildSystem = do
+ d <- Package.getLibDir
+ return $ if "stack-work" `isInfixOf` d then "stack" else "cabal"
interactiveInit :: IO ()
interactiveInit = ifM (doesDirectoryExist =<< dotPropellor)
@@ -125,12 +120,11 @@ setup = do
section
putStrLn "Let's try building the propellor configuration, to make sure it will work..."
putStrLn ""
+ b <- buildSystem
void $ boolSystem "git"
[ Param "config"
, Param "propellor.buildsystem"
- , Param $ case initCfg of
- UseCabal -> "cabal"
- UseStack -> "stack"
+ , Param b
]
buildPropellor Nothing
putStrLn ""