summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 16:45:32 -0400
committerJoey Hess2014-03-31 16:45:32 -0400
commit19627d9ec9e7b1c55330910fbe00e58d664d45d8 (patch)
treebaaca40d4351b2032dc569908e860416d7b8ba01 /Propellor
parentf9d6227d9d26600b13aac764fbe2b70459b5bc29 (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs19
1 files changed, 9 insertions, 10 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index fd5daed4..8968d278 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