summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 01:25:54 -0400
committerJoey Hess2014-11-18 01:25:54 -0400
commite4e2f44392f8509f38606eacc8bf827c405a46a9 (patch)
tree035c2e0001fe1c0c8cb83c3f9f7d1c84be9e00ce /src
parenta30b5a6bfd1b6f49a11f0087c8c93c237a781738 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/CmdLine.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index f3cf2f91..a4e45981 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -42,6 +42,7 @@ processCmdLine = go =<< getArgs
go ("--help":_) = usage
go ("--spin":h:[]) = return $ Spin h
go ("--boot":h:[]) = return $ Boot h
+ go ("--run":h:[]) = return $ Run h
go ("--add-key":k:[]) = return $ AddKey k
go ("--set":f:c:[]) = withprivfield f c Set
go ("--dump":f:c:[]) = withprivfield f c Dump
@@ -186,8 +187,8 @@ spin hn hst = do
void $ boolSystem "git" [Param "push"]
cacheparams <- toCommand <$> sshCachingParams hn
go cacheparams url =<< hostprivdata
- unlessM (boolSystem "ssh" (map Param (cacheparams ++ ["-t", user, spincmd]))) $
- error $ "remote propellor failed (running: " ++ spincmd ++")"
+ unlessM (boolSystem "ssh" (map Param (cacheparams ++ ["-t", user, runcmd]))) $
+ error $ "remote propellor failed (running: " ++ runcmd ++")"
where
hostprivdata = show . filterPrivData hst <$> decryptPrivData
@@ -228,8 +229,8 @@ spin hn hst = do
, "fi"
]
- spincmd = mkcmd
- [ "cd " ++ localdir ++ " && ./propellor --continue " ++ shellEscape (show (Chain hn)) ]
+ runcmd = mkcmd
+ [ "cd " ++ localdir ++ " && ./propellor --run " ++ hn ]
getstatus :: Handle -> IO BootStrapStatus
getstatus h = do