diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 15:06:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 15:06:10 -0400 |
| commit | c3711ff09cdaf7ca203af67d393aaeb19ebddfd0 (patch) | |
| tree | 1243e74743851d2bd3e600113dc618c20211221a | |
| parent | 90a6b1f094ba12b734015a27cfc5e326c5f413cb (diff) | |
| parent | 527ae1dc208599bee15afd8167eeec17744a6b0b (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/wrapper.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs index 24d77234..3c1231ee 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -57,7 +57,8 @@ wrapper args propellordir propellorbin = do putStrLn $ "Setting up your propellor repo in " ++ propellordir putStrLn "" localexists <- doesFileExist localrepo <||> doesDirectoryExist localrepo - void $ boolSystem "git" [Param "clone", File (if localexists then localrepo else netrepo). File propellordir] + let repo = if localexists then localrepo else netrepo + void $ boolSystem "git" [Param "clone", File repo, File propellordir] buildruncfg = do changeWorkingDirectory propellordir ifM (boolSystem "make" [Param "build"]) |