cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-30 22:23:18 -04:00
parent 4357d61174
commit bb0425975c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Property/Cmd.hs
View File

@ -32,4 +32,4 @@ cmdProperty' cmd params env = Property desc $ do
scriptProperty :: [String] -> Property scriptProperty :: [String] -> Property
scriptProperty script = cmdProperty "sh" [Param "-c", Param shellcmd] scriptProperty script = cmdProperty "sh" [Param "-c", Param shellcmd]
where where
shellcmd = intercalate " && " script shellcmd = intercalate " ; " ("set -e" : script)

2
Property/JoeySites.hs
View File

@ -9,7 +9,7 @@ import qualified Property.Apt as Apt
oldUseNetshellBox :: Property oldUseNetshellBox :: Property
oldUseNetshellBox = check (not <$> Apt.isInstalled "oldusenet") $ oldUseNetshellBox = check (not <$> Apt.isInstalled "oldusenet") $
propertyList ("olduse.net shellbox") 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" `describe` "olduse.net build deps"
, scriptProperty , scriptProperty
[ "git clone git://olduse.net/ /root/tmp/oldusenet/source" [ "git clone git://olduse.net/ /root/tmp/oldusenet/source"