propellor spin

Propellor/CmdLine.hs

@@ -75,15 +75,11 @@ spin host = do
 		status <- getstatus fromh `catchIO` error "protocol error"
 		case status of
 			NeedKeyRing -> do
-				d <- BL.readFile keyring
+				d <- w82s . BL.unpack . B64.encode
-				putStr $ "Sending " ++ keyring ++ " (" ++ show (BL.length d) ++ " bytes) to " ++ host ++ "..."
+					<$> BL.readFile keyring
-				hFlush stdout
+				senddata toh keyring keyringMarker d
-				hPutStrLn toh $ toMarked keyringMarker $ w82s $ BL.unpack $ B64.encode d
-				hFlush toh
-				putStrLn "done"
 			HaveKeyRing -> noop
-		hPutStrLn toh $ toMarked privDataMarker privdata
+		senddata toh (privDataFile host) privDataMarker privdata
-		hFlush toh
 		hClose toh
 
 		-- Display remaining output.
@@ -115,6 +111,12 @@ spin host = do
 				getstatus h
 			Just status -> return status
 	showremote s = putStrLn s
+	senddata toh f marker s = do
+		putStr $ "Sending " ++ f ++ " (" ++ show (length s) ++ " bytes) to " ++ host ++ "..."
+		hFlush stdout
+		hPutStrLn toh $ toMarked marker s
+		hFlush toh
+		putStrLn "done"
 
 data BootStrapStatus = HaveKeyRing | NeedKeyRing
 	deriving (Read, Show, Eq)