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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 15:04:24 -04:00
parent 21897c955e 71ccd256da
commit 90a6b1f094
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wrapper.hs
View File

@ -56,13 +56,8 @@ wrapper args propellordir propellorbin = do
makeRepo = do makeRepo = do
putStrLn $ "Setting up your propellor repo in " ++ propellordir putStrLn $ "Setting up your propellor repo in " ++ propellordir
putStrLn "" putStrLn ""
ifM (doesFileExist localrepo <||> doesDirectoryExist localrepo) localexists <- doesFileExist localrepo <||> doesDirectoryExist localrepo
( void $ boolSystem "git" [Param "clone", File localrepo, File propellordir] void $ boolSystem "git" [Param "clone", File (if localexists then localrepo else netrepo). File propellordir]
, do
void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
whenM (doesDirectoryExist (propellordir </> "privdata")) $
mapM_ nukeFile =<< dirContents (propellordir </> "privdata")
)
buildruncfg = do buildruncfg = do
changeWorkingDirectory propellordir changeWorkingDirectory propellordir
ifM (boolSystem "make" [Param "build"]) ifM (boolSystem "make" [Param "build"])