@@ -4,12 +4,9 @@
44{-# LANGUAGE ScopedTypeVariables #-}
55module Obelisk.Command.Deploy where
66
7−import Control.Applicative
87import Control.Monad
98import Control.Monad.IO.Class (liftIO)
10−import Data.Attoparsec.ByteString.Char8 as A
119import Data.Bits
12−import qualified Data.ByteString.Char8 as BC8
1310import Data.Default
1411import qualified Data.Map as Map
1512import Data.Maybe
@@ -20,7 +17,7 @@ import System.Directory
2017import System.Environment (getEnvironment)
2118import System.FilePath
2219import System.Posix.Files
23−import System.Process (delegate_ctlc, env, proc, readProcess)
20+import System.Process (delegate_ctlc, env, proc)
2421
2522import Obelisk.App (MonadObelisk)
2623import Obelisk.CliApp (Severity (..), callProcessAndLogOutput, failWith, putLog, withSpinner)
@@ -136,17 +133,6 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
136133 result <- nixBuildAttrWithCache srcDir $ platform <> ".frontend"
137134 callProcessAndLogOutput (Notice, Error) $ proc (result </> "bin" </> "deploy") mobileArgs
138135
139−sshAgent :: IO [(String, String)]
140−sshAgent = do
141− output <- BC8.pack <$> readProcess "ssh-agent" ["-c"] mempty
142− return $ fromMaybe mempty $ A.maybeResult $ A.parse (A.many' p) output
143− where
144− p = do
145− key <- A.string "setenv" >> A.skipSpace >> A.takeWhile (not . isSpace)
146− val <- A.skipSpace >> A.takeWhile (/= ';')
147− _ <- A.string ";" >> A.endOfLine <|> void (A.string ";")
148− return (BC8.unpack key, BC8.unpack val)
149−
150136verifyHostKey :: MonadObelisk m => FilePath -> FilePath -> String -> m ()
151137verifyHostKey knownHostsPath keyPath hostName =
152138 callProcessAndLogOutput (Notice, Warning) $ proc "ssh" $