From 5422a5b3764855bb1109648fb401a9b15bf2919c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 14:11:36 -0400 Subject: nochange on service --- Propellor/Property/Cmd.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Propellor/Property/Cmd.hs b/Propellor/Property/Cmd.hs index 09db6500..b1c9435a 100644 --- a/Propellor/Property/Cmd.hs +++ b/Propellor/Property/Cmd.hs @@ -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 -- cgit v1.2.3