propellor spin

This commit is contained in:
Joey Hess 2014-03-31 18:36:53 -04:00
parent c246a8ee74
commit eb78bbae19
Failed to extract signature
3 changed files with 4 additions and 7 deletions

View File

@ -147,7 +147,7 @@ spin host = do
]
, "else " ++ intercalate " && "
[ "cd " ++ localdir
--, "if ! test -x ./propellor; then make build; fi"
, "if ! test -x ./propellor; then make build; fi"
, "./propellor --boot " ++ host
]
, "fi"

View File

@ -10,13 +10,12 @@ import Propellor.Types
actionMessage :: ActionResult r => Desc -> IO r -> IO r
actionMessage desc a = do
setTitle desc
showdesc
putStrLn "starting"
hFlush stdout
r <- a
let (msg, intensity, color) = getActionResult r
putStr $ desc ++ " ... "
showdesc
setSGR [SetColor Foreground intensity color]
putStrLn msg
@ -24,8 +23,6 @@ actionMessage desc a = do
hFlush stdout
return r
where
showdesc = putStr $ desc ++ " ... "
warningMessage :: String -> IO ()
warningMessage s = do

View File

@ -30,8 +30,8 @@ class ActionResult a where
getActionResult :: a -> (String, ColorIntensity, Color)
instance ActionResult Bool where
getActionResult False = ("ok", Vivid, Red)
getActionResult True = ("failed", Vivid, Green)
getActionResult False = ("failed", Vivid, Red)
getActionResult True = ("ok", Vivid, Green)
instance ActionResult Result where
getActionResult NoChange = ("unchanged", Dull, Green)