summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index c84b0dca..1abad06f 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -26,13 +26,14 @@ scrollBox :: Property HasInfo
scrollBox = propertyList "scroll shell box" $ props
& alias "scroll.joeyh.name"
& User.accountFor "scroll"
- & Git.cloned "root" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing
+ & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing
& Apt.installed ["ghc", "make", "cabal-install", "libghc-vector-dev",
"libghc-bytestring-dev", "libghc-mtl-dev", "libghc-ncurses-dev",
"libghc-random-dev", "libghc-monad-loops-dev",
"libghc-ifelse-dev", "libghc-case-insensitive-dev"]
- & scriptProperty
+ & userScriptProperty "scroll"
[ "cd " ++ d </> "scroll"
+ , "git pull"
, "cabal configure"
, "make"
]
@@ -40,7 +41,7 @@ scrollBox = propertyList "scroll shell box" $ props
[ "#!/bin/sh"
, "set -e"
, "echo Preparing to run scroll!"
- , "cd " ++ d </> "scroll"
+ , "cd " ++ d
, "mkdir -p tmp"
, "TMPDIR= t=$(tempfile -d tmp)"
, "rm -f \"$t\""