nochange on service

This commit is contained in:
Joey Hess 2014-04-01 14:11:36 -04:00
parent 407f1b27fc
commit 5422a5b376
1 changed files with 6 additions and 3 deletions

View File

@ -5,10 +5,12 @@ module Propellor.Property.Cmd (
serviceRunning,
) where
import Control.Monad
import Control.Applicative
import Data.List
import Propellor.Types
import Propellor.Engine
import Utility.Monad
import Utility.SafeCommand
import Utility.Env
@ -43,6 +45,7 @@ scriptProperty script = cmdProperty "sh" ["-c", shellcmd]
-- we can do is try to start the service, and if it fails, assume
-- this means it's already running.
serviceRunning :: String -> Property
serviceRunning svc = scriptProperty
["service " ++ shellEscape svc ++ " start >/dev/null 2>&1 || true"]
`describe` ("running " ++ svc)
serviceRunning svc = Property ("running " ++ svc) $ do
void $ ensureProperty $
scriptProperty ["service " ++ shellEscape svc ++ " start >/dev/null 2>&1 || true"]
return NoChange