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

fix bootstrapping from a different branch than master

This commit is contained in:
Joey Hess 2014-04-03 12:33:36 -04:00
parent 492e4c68c8
commit 8573c39d48
Failed to extract signature
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Propellor/CmdLine.hs
View File

@ -94,11 +94,14 @@ buildFirst cmdline next = do
where where
getmtime = catchMaybeIO $ getModificationTime "propellor" getmtime = catchMaybeIO $ getModificationTime "propellor"
getCurrentBranch :: IO String
getCurrentBranch = takeWhile (/= '\n')
<$> readProcess "git" ["symbolic-ref", "--short", "HEAD"]
updateFirst :: CmdLine -> IO () -> IO () updateFirst :: CmdLine -> IO () -> IO ()
updateFirst cmdline next = do updateFirst cmdline next = do
branchref <- takeWhile (/= '\n') branchref <- getCurrentBranch
<$> readProcess "git" ["symbolic-ref", "HEAD"] let originbranch = "origin" </> branchref
let originbranch = "origin" </> takeFileName branchref
void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"] void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"]
@ -144,9 +147,10 @@ spin host = do
url <- getUrl url <- getUrl
void $ gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"] void $ gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
void $ boolSystem "git" [Param "push"] void $ boolSystem "git" [Param "push"]
go url =<< gpgDecrypt (privDataFile host) branch <- getCurrentBranch
go url branch =<< gpgDecrypt (privDataFile host)
where where
go url privdata = withBothHandles createProcessSuccess (proc "ssh" [user, bootstrapcmd]) $ \(toh, fromh) -> do go url branch privdata = withBothHandles createProcessSuccess (proc "ssh" [user, bootstrapcmd branch]) $ \(toh, fromh) -> do
let finish = do let finish = do
senddata toh (privDataFile host) privDataMarker privdata senddata toh (privDataFile host) privDataMarker privdata
hClose toh hClose toh
@ -166,7 +170,7 @@ spin host = do
user = "root@"++host user = "root@"++host
bootstrapcmd = shellWrap $ intercalate " ; " bootstrapcmd branch = shellWrap $ intercalate " ; "
[ "if [ ! -d " ++ localdir ++ " ]" [ "if [ ! -d " ++ localdir ++ " ]"
, "then " ++ intercalate " && " , "then " ++ intercalate " && "
[ "apt-get -y install git" [ "apt-get -y install git"
@ -174,6 +178,8 @@ spin host = do
] ]
, "else " ++ intercalate " && " , "else " ++ intercalate " && "
[ "cd " ++ localdir [ "cd " ++ localdir
, "git checkout -b " ++ branch
, "git branch --set-upstream-to=origin/" ++ branch ++ " " ++ branch
, "if ! test -x ./propellor; then make build; fi" , "if ! test -x ./propellor; then make build; fi"
, "./propellor --boot " ++ host , "./propellor --boot " ++ host
] ]