From 42c1106ea0926be314e3d7d40b953f8d93950483 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Feb 2015 12:57:20 -0400 Subject: support installing build deps using pure cabal, rather than debian packages for non-debian systems --- src/Propellor/Bootstrap.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Propellor') 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" -- cgit v1.2.3