Merge branch 'joeyconfig'

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"])