summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 19:31:35 -0400
committerJoey Hess2014-03-31 19:31:35 -0400
commitd53729495efe7174239deab3b5dd71204543b0d0 (patch)
tree522e11f8d5362ea373d13ed8029368a4b1cd83c2 /Propellor
parenta020b66fcb2c10e81409f5ebc7b3bdb40dbaef45 (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs6
-rw-r--r--Propellor/Engine.hs2
-rw-r--r--Propellor/Message.hs4
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