From 4779718787ed3a8457e566d508668db00a918a1c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 16:52:20 -0400 Subject: indents --- src/Propellor/Bootstrap.hs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/Propellor/Bootstrap.hs') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index c5004a52..6c79535f 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -57,8 +57,8 @@ depsCommand :: System -> ShellCommand depsCommand (System distr _) = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ " ) || true" where osinstall = case distr of - (FreeBSD _) -> map pkginstall fbsddeps - _ -> "apt-get update" : map aptinstall debdeps + (FreeBSD _) -> map pkginstall fbsddeps + _ -> "apt-get update" : map aptinstall debdeps cabalinstall = [ "cabal update" @@ -106,14 +106,12 @@ depsCommand (System distr _) = "( " ++ intercalate " ; " (concat [osinstall, cab , "gmake" ] - installGitCommand :: System -> ShellCommand -installGitCommand (System distr _) = - case distr of - (FreeBSD _) -> - "if ! git --version >/dev/null; then ASSUME_ALWAYS_YES=yes pkg update && ASSUME_ALWAYS_YES=yes pkg install git; fi" - _ -> - "if ! git --version >/dev/null; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends --no-upgrade -y install git; fi" +installGitCommand (System distr _) = case distr of + (FreeBSD _) -> + "if ! git --version >/dev/null; then ASSUME_ALWAYS_YES=yes pkg update && ASSUME_ALWAYS_YES=yes pkg install git; fi" + _ -> + "if ! git --version >/dev/null; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends --no-upgrade -y install git; fi" buildPropellor :: IO () buildPropellor = unlessM (actionMessage "Propellor build" build) $ -- cgit v1.2.3