cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable terminal for --boot

This commit is contained in:
Joey Hess 2014-11-18 18:07:26 -04:00
parent d952c84407
commit e262a49a80
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Propellor/CmdLine.hs
View File

@ -196,12 +196,14 @@ getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref
-- updated, it's run. -- updated, it's run.
spin :: HostName -> Host -> IO () spin :: HostName -> Host -> IO ()
spin hn hst = do spin hn hst = do
void $ gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"] void $ actionMessage "git commit (signed)" $
gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
-- Push to central origin repo first, if possible. -- Push to central origin repo first, if possible.
-- The remote propellor will pull from there, which avoids -- The remote propellor will pull from there, which avoids
-- us needing to send stuff directly to the remote host. -- us needing to send stuff directly to the remote host.
whenM hasOrigin $ whenM hasOrigin $
void $ boolSystem "git" [Param "push"] void $ actionMessage "pushing to central git repository" $
boolSystem "git" [Param "push"]
cacheparams <- toCommand <$> sshCachingParams hn cacheparams <- toCommand <$> sshCachingParams hn
comm cacheparams =<< hostprivdata comm cacheparams =<< hostprivdata
@ -212,7 +214,7 @@ spin hn hst = do
comm cacheparams privdata = comm cacheparams privdata =
withBothHandles createProcessSuccess withBothHandles createProcessSuccess
(proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) (proc "ssh" $ cacheparams ++ ["-t", user, bootstrapcmd])
(comm' cacheparams privdata) (comm' cacheparams privdata)
comm' cacheparams privdata (toh, fromh) = loop comm' cacheparams privdata (toh, fromh) = loop
where where