summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Git.hs
diff options
context:
space:
mode:
authorJelmer Vernooij2015-04-22 20:59:14 -0400
committerJoey Hess2015-04-22 20:59:14 -0400
commitc7a156a8c359d714da88892154ad034eeb597836 (patch)
tree591623229620d1ff29d77352386fa15db18757e6 /src/Propellor/Property/Git.hs
parent4bd933118d9ecb711b19a6db7b94f24c2733d1a2 (diff)
ensureProperty takes a list of commands to run, but Git.bareRepo
previously passed a list of arguments instead. Signed-Off-By: Jelmer Vernooij <jelmer@debian.org>
Diffstat (limited to 'src/Propellor/Property/Git.hs')
-rw-r--r--src/Propellor/Property/Git.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs
index 0ac8eb84..0fc22616 100644
--- a/src/Propellor/Property/Git.hs
+++ b/src/Propellor/Property/Git.hs
@@ -103,15 +103,15 @@ bareRepo repo user gitshared = check (isRepo repo) $ propertyList ("git repo: "
dirExists repo : case gitshared of
NotShared ->
[ ownerGroup repo user (userGroup user)
- , userScriptProperty user ["git", "init", "--bare", "--shared=false", repo]
+ , userScriptProperty user ["git init --bare --shared=false " ++ shellEscape repo]
]
SharedAll ->
[ ownerGroup repo user (userGroup user)
- , userScriptProperty user ["git", "init", "--bare", "--shared=all", repo]
+ , userScriptProperty user ["git init --bare --shared=all " ++ shellEscape repo]
]
Shared group' ->
[ ownerGroup repo user group'
- , userScriptProperty user ["git", "init", "--bare", "--shared=group", repo]
+ , userScriptProperty user ["git init --bare --shared=group " ++ shellEscape repo]
]
where
isRepo repo' = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", repo'])