From 71ccd256da18dd4f38df0b631eee752b299602d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 15:04:12 -0400 Subject: stop removing privdata, it's no longer in master --- src/wrapper.hs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') 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"]) -- cgit v1.2.3