diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-30 22:23:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-30 22:23:18 -0400 |
| commit | bb0425975c53b770c0958b51223bd21c41aa1187 (patch) | |
| tree | b80c8a43980736e55da191c1244b0750b2414e00 /Property | |
| parent | 4357d6117453e1a0759a6482f4006fa042110a6c (diff) | |
propellor spin
Diffstat (limited to 'Property')
| -rw-r--r-- | Property/Cmd.hs | 2 | ||||
| -rw-r--r-- | Property/JoeySites.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Property/Cmd.hs b/Property/Cmd.hs index 0a4a5ba4..278d2fb0 100644 --- a/Property/Cmd.hs +++ b/Property/Cmd.hs @@ -32,4 +32,4 @@ cmdProperty' cmd params env = Property desc $ do scriptProperty :: [String] -> Property scriptProperty script = cmdProperty "sh" [Param "-c", Param shellcmd] where - shellcmd = intercalate " && " script + shellcmd = intercalate " ; " ("set -e" : script) diff --git a/Property/JoeySites.hs b/Property/JoeySites.hs index 35d51095..550c79ea 100644 --- a/Property/JoeySites.hs +++ b/Property/JoeySites.hs @@ -9,7 +9,7 @@ import qualified Property.Apt as Apt oldUseNetshellBox :: Property oldUseNetshellBox = check (not <$> Apt.isInstalled "oldusenet") $ propertyList ("olduse.net shellbox") - [ Apt.installed (words "build-essential git ghc libghc-strptime-dev libghc-hamlet-dev libghc-ifelse-dev libghc-hxt-dev libghc-utf8-string-dev libghc-missingh-dev libghc-sha-dev") + [ Apt.installed (words "build-essential debhelper git ghc libghc-strptime-dev libghc-hamlet-dev libghc-ifelse-dev libghc-hxt-dev libghc-utf8-string-dev libghc-missingh-dev libghc-sha-dev") `describe` "olduse.net build deps" , scriptProperty [ "git clone git://olduse.net/ /root/tmp/oldusenet/source" |