summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-03-12 22:05:17 -0400
committerJoey Hess2015-03-12 22:05:17 -0400
commitbeb49d2c2bee77dc67f68329a2e99c6c4b4ccc43 (patch)
treec1efb1aea2f732af5be510c7923b544fa43e5ccd /src
parentd3f49c55ec97d61834c258491b864212b2e7a0e8 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index c905b462..1ed9e5db 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -49,13 +49,16 @@ scrollBox = propertyList "scroll server" $ props
, "mkdir \"$t\""
, "cd \"$t\""
, "echo"
+ , "echo Note that games on this server are time-limited to 2 hours"
+ , "echo 'Need more time? Run scroll locally instead!'"
+ , "echo"
, "echo Press Enter to start the game."
, "read me"
, "SHELL=/bin/sh script --timing=timing -c " ++ g
] `onChange` (s `File.mode` (combineModes (ownerWriteMode:readModes ++ executeModes)))
& g `File.hasContent`
[ "#!/bin/sh"
- , "if ! ../../scroll/scroll; then"
+ , "if ! timeout --kill-after 1m --foreground 2h ../../scroll/scroll; then"
, "echo Scroll seems to have ended unexpectedly. Possibly a bug.."
, "else"
, "echo Thanks for playing scroll! https://joeyh.name/code/scroll/"