From 19627d9ec9e7b1c55330910fbe00e58d664d45d8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:45:32 -0400 Subject: [PATCH] propellor spin --- Propellor/CmdLine.hs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index fd5daed..8968d27 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -142,17 +142,16 @@ spin host = do user = "root@"++host bootstrapcmd = shellWrap $ intercalate " && " - [ intercalate " ; " - [ "if [ ! -d " ++ localdir ++ " ]" - , "then " ++ intercalate " && " - [ "apt-get -y install git" - , "echo " ++ toMarked statusMarker (show NeedGitClone) - ] - , "fi" + [ "if [ ! -d " ++ localdir ++ " ]" + , "then " ++ intercalate " && " + [ "apt-get -y install git" + , "echo " ++ toMarked statusMarker (show NeedGitClone) + ] + , "else " ++ intercalate " && " + [ "cd " ++ localdir + , "if [ ! -x ./propellor ]; then make build; fi" + , "./propellor --boot " ++ host ] - , "cd " ++ localdir - , "make build" - , "./propellor --boot " ++ host ] getstatus :: Handle -> IO BootStrapStatus