summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 15:04:24 -0400
committerJoey Hess2014-08-19 15:04:24 -0400
commit90a6b1f094ba12b734015a27cfc5e326c5f413cb (patch)
treeef0a6a6902a4c65a8a72e84d3f821c18cd24019a
parent21897c955ed5a38fe6da5246ca90bfbaaba57b04 (diff)
parent71ccd256da18dd4f38df0b631eee752b299602d1 (diff)
Merge branch 'joeyconfig'
-rw-r--r--src/wrapper.hs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 4c3f8074..24d77234 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -56,13 +56,8 @@ wrapper args propellordir propellorbin = do
makeRepo = do
putStrLn $ "Setting up your propellor repo in " ++ propellordir
putStrLn ""
- ifM (doesFileExist localrepo <||> doesDirectoryExist localrepo)
- ( void $ boolSystem "git" [Param "clone", File localrepo, File propellordir]
- , do
- void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
- whenM (doesDirectoryExist (propellordir </> "privdata")) $
- mapM_ nukeFile =<< dirContents (propellordir </> "privdata")
- )
+ localexists <- doesFileExist localrepo <||> doesDirectoryExist localrepo
+ void $ boolSystem "git" [Param "clone", File (if localexists then localrepo else netrepo). File propellordir]
buildruncfg = do
changeWorkingDirectory propellordir
ifM (boolSystem "make" [Param "build"])