summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 20:02:44 -0400
committerJoey Hess2014-11-22 20:02:44 -0400
commiteb946f109bb895545dd41c7328d900648e2eb71a (patch)
tree0f23393c0af7bab5bea02bb69f66ee507a566e00
parent68a28d3cccc4f8223d8f44a8436cea76634dc08d (diff)
look for /usr/local/propellor/.git to know if it's fully deployed
When propellor is deployed by uploading the binary, there's no git repo, so each spin needs to re-upload it to get any config changes. This should be rare since this is only intended to be used when taking over a host and getting it properly set up from source, but it still needs to be supported.
-rw-r--r--src/Propellor/CmdLine.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index e808395b..5c051d1c 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -190,7 +190,7 @@ spin target relay hst = do
mkcmd = shellWrap . intercalate " ; "
updatecmd = mkcmd
- [ "if [ ! -d " ++ localdir ++ " ]"
+ [ "if [ ! -d " ++ localdir ++ "/.git ]"
, "then (" ++ intercalate " && "
[ "if ! git --version || ! make --version; then apt-get update && apt-get --no-install-recommends --no-upgrade -y install git make; fi"
, "echo " ++ toMarked statusMarker (show NeedGitClone)