From beb49d2c2bee77dc67f68329a2e99c6c4b4ccc43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Mar 2015 22:05:17 -0400 Subject: [PATCH] propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c905b46..1ed9e5d 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/"