summaryrefslogtreecommitdiff
path: root/src/Propellor/Spin.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-28 13:08:05 -0400
committerJoey Hess2015-02-28 13:08:05 -0400
commit970ffbd0d6fbf3ab6ad36f867cfafbcfb2895324 (patch)
treeac15dabe7313a7383569be1384127bb1ce836145 /src/Propellor/Spin.hs
parent8777dc2e55068ac6472a4975ef70ceef644407be (diff)
parentec64af82f0f87df939abb6dd0727628a2cd88906 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Spin.hs')
-rw-r--r--src/Propellor/Spin.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 5063145e..f55f2977 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -24,6 +24,7 @@ import Propellor.PrivData.Paths
import Propellor.Git
import Propellor.Ssh
import Propellor.Gpg
+import Propellor.Bootstrap
import Propellor.Types.CmdLine
import qualified Propellor.Shim as Shim
import Utility.FileMode
@@ -69,7 +70,7 @@ spin target relay hst = do
probecmd = intercalate " ; "
[ "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"
+ [ installGitCommand
, "echo " ++ toMarked statusMarker (show NeedGitClone)
] ++ ") || echo " ++ toMarked statusMarker (show NeedPrecompiled)
, "else " ++ updatecmd
@@ -78,7 +79,7 @@ spin target relay hst = do
updatecmd = intercalate " && "
[ "cd " ++ localdir
- , "if ! test -x ./propellor; then make deps build; fi"
+ , bootstrapPropellorCommand
, if viarelay
then "./propellor --continue " ++
shellEscape (show (Relay target))