Skip to content

Commit

Permalink
Properly exit after check failure
Browse files Browse the repository at this point in the history
  • Loading branch information
tchoutri committed May 27, 2024
1 parent 520eb36 commit 0d5438f
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions src/Confer/Cmd/Check.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@ import Data.Foldable
import Data.Function
import Data.List.NonEmpty
import Data.List.NonEmpty qualified as NE
import Data.Text (Text)
import Data.Text qualified as Text
import Data.Text.Display
import Data.Text.IO qualified as Text
import Data.Text.IO qualified as Text
import Effectful
import Effectful.FileSystem (FileSystem)
import Effectful.FileSystem qualified as FileSystem
import System.Exit qualified as System
import System.Info qualified as System
import System.OsPath ((</>), OsPath)
import System.OsPath qualified as OsPath
import Validation

import Confer.Config.Evaluator
import Confer.Config.Types
import Confer.Effect.Symlink (Symlink, SymlinkError)
import Confer.Effect.Symlink (Symlink, SymlinkError(..))
import Confer.Effect.Symlink qualified as Symlink

check
Expand All @@ -39,8 +42,11 @@ check = do
liftIO $ Text.putStrLn $ "[+] Checking " <> display fact
validateSymlink fact) deployments
case result of
Failure errors->
liftIO $ print errors
Failure errors -> do
forM_ errors $
\e ->
liftIO $ Text.putStrLn $ formatSymlinkError e
liftIO $ System.exitFailure
Success _ -> pure ()
Left e -> error e

Expand All @@ -54,3 +60,13 @@ validateSymlink fact = do
case result of
Right _ -> pure $ Success ()
Left e -> pure $ Failure (NE.singleton e)

formatSymlinkError :: SymlinkError -> Text
formatSymlinkError (DoesNotExist path) =
"[!] "
<> display (Text.pack . show $ path)
<> " does not exist"
formatSymlinkError (IsNotSymlink path) =
"[!] "
<> display (Text.pack . show $ path)
<> " is not a symbolic link!"

0 comments on commit 0d5438f

Please sign in to comment.