propellor spin

Propellor/CmdLine.hs

@@ -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"

Propellor/Message.hs

@@ -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

Propellor/Types.hs

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