From d53729495efe7174239deab3b5dd71204543b0d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 19:31:35 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 6 +++--- Propellor/Engine.hs | 2 +- Propellor/Message.hs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index c3576b94..325f8d68 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -73,7 +73,7 @@ unknownhost h = errorMessage $ unwords buildFirst :: CmdLine -> IO () -> IO () buildFirst cmdline next = do oldtime <- getmtime - ifM (actionMessage "Rebuilding propellor" $ boolSystem "make" [Param "build"]) + ifM (actionMessage "Propellor build" $ boolSystem "make" [Param "build"]) ( do newtime <- getmtime if newtime == oldtime @@ -90,7 +90,7 @@ updateFirst cmdline next = do <$> readProcess "git" ["symbolic-ref", "HEAD"] let originbranch = "origin" takeFileName branchref - void $ actionMessage "Fetching" $ boolSystem "git" [Param "fetch"] + void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"] whenM (doesFileExist keyring) $ do {- To verify origin/master commit's signature, have to @@ -120,7 +120,7 @@ updateFirst cmdline next = do if oldsha == newsha then next - else ifM (actionMessage "Rebuilding propellor" $ boolSystem "make" [Param "build"]) + else ifM (actionMessage "Propellor build" $ boolSystem "make" [Param "build"]) ( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] , errorMessage "Propellor build failed!" ) diff --git a/Propellor/Engine.hs b/Propellor/Engine.hs index e35e4c84..1ae224ca 100644 --- a/Propellor/Engine.hs +++ b/Propellor/Engine.hs @@ -15,7 +15,7 @@ ensureProperty = catchDefaultIO FailedChange . propertySatisfy ensureProperties :: [Property] -> IO () ensureProperties ps = do r <- ensureProperties' [Property "overall" $ ensureProperties' ps] - setTitle "propellor done" + setTitle "propellor: done" hFlush stdout case r of FailedChange -> exitWith (ExitFailure 1) diff --git a/Propellor/Message.hs b/Propellor/Message.hs index 7f451946..90163649 100644 --- a/Propellor/Message.hs +++ b/Propellor/Message.hs @@ -9,7 +9,7 @@ import Propellor.Types -- display. actionMessage :: ActionResult r => Desc -> IO r -> IO r actionMessage desc a = do - setTitle desc + setTitle $ "propellor: " ++ desc hFlush stdout r <- a @@ -19,7 +19,7 @@ actionMessage desc a = do setSGR [SetColor Foreground intensity color] putStrLn msg setSGR [] - setTitle "Propellor running" + setTitle "propellor: running" hFlush stdout return r -- cgit v1.2.3