diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 15:04:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 15:04:12 -0400 |
| commit | 71ccd256da18dd4f38df0b631eee752b299602d1 (patch) | |
| tree | c8fa13b778982320f6458c572a52cc4193893c57 /src | |
| parent | 7d59dee4690297154f6924a04949413ddea8a17b (diff) | |
stop removing privdata, it's no longer in master
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapper.hs | 9 |
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"]) |