support installing build deps using pure cabal, rather than debian packages

for non-debian systems

1 files changed, 6 insertions, 2 deletions

diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 0b3072b2..45340832 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -31,11 +31,15 @@ buildCommand = intercalate " && "
 	]
 
 depsCommand :: ShellCommand
-depsCommand = "(" ++ aptinstall debdeps ++ " || (apt-get update && " ++ aptinstall debdeps ++ ")) || true;"
-	++ "(" ++ aptinstall ["libghc-async-dev"] ++ " || (cabal update; cabal install async)) || true"
+depsCommand = 
+	"(" ++ aptinstall debdeps ++ " || (apt-get update && " ++ aptinstall debdeps ++ ")) && "
+	++ "(" ++ aptinstall ["libghc-async-dev"] ++ " || (" ++ cabalinstall ["async"] ++  ")) || "
+	++ "(" ++ cabalinstall ["--only-dependencies"] ++ ")"
   where
 	aptinstall ps = "apt-get --no-upgrade --no-install-recommends -y install " ++ unwords ps
 
+	cabalinstall ps = "cabal update; cabal install " ++ unwords ps
+
 	-- This is the same build deps listed in debian/control.
 	debdeps =
 		[ "gnupg"