From 17fb83b2289f527d4242a7b66df963b56f850f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sat, 31 May 2025 16:54:42 +0200
Subject: Print source line of shell command failure

---
 src/Parser/Shell.hs | 2 ++
 src/Script/Shell.hs | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Parser/Shell.hs b/src/Parser/Shell.hs
index 09f953c..89595e8 100644
--- a/src/Parser/Shell.hs
+++ b/src/Parser/Shell.hs
@@ -67,11 +67,13 @@ parseArguments = foldr (liftA2 (:)) (Pure []) <$> many parseArgument
 
 shellStatement :: TestParser (Expr [ ShellStatement ])
 shellStatement = label "shell statement" $ do
+    line <- getSourceLine
     command <- parseArgument
     args <- parseArguments
     return $ fmap (: []) $ ShellStatement
         <$> command
         <*> args
+        <*> pure line
 
 shellScript :: TestParser (Expr ShellScript)
 shellScript = do
diff --git a/src/Script/Shell.hs b/src/Script/Shell.hs
index 8f25ab5..b00dc5f 100644
--- a/src/Script/Shell.hs
+++ b/src/Script/Shell.hs
@@ -23,18 +23,20 @@ import Network
 import Output
 import Process
 import Run.Monad
+import Script.Var
 
 
 data ShellStatement = ShellStatement
     { shellCommand :: Text
     , shellArguments :: [ Text ]
+    , shellSourceLine :: SourceLine
     }
 
 newtype ShellScript = ShellScript [ ShellStatement ]
 
 
 executeScript :: Node -> ProcName -> MVar ExitCode -> Handle -> Handle -> Handle -> ShellScript -> TestRun ()
-executeScript node _ statusVar pstdin pstdout pstderr (ShellScript statements) = do
+executeScript node pname statusVar pstdin pstdout pstderr (ShellScript statements) = do
     forM_ statements $ \ShellStatement {..} -> case shellCommand of
         "echo" -> liftIO $ do
             T.hPutStrLn pstdout $ T.intercalate " " shellArguments
@@ -51,6 +53,7 @@ executeScript node _ statusVar pstdin pstdout pstderr (ShellScript statements) =
             liftIO (waitForProcess phandle) >>= \case
                 ExitSuccess -> return ()
                 status -> do
+                    outLine OutputChildFail (Just $ textProcName pname) $ "failed at: " <> textSourceLine shellSourceLine
                     liftIO $ putMVar statusVar status
                     throwError Failed
     liftIO $ putMVar statusVar ExitSuccess
-- 
cgit v1.2.3