slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

;run: don't exit repl when subcommand exits

Browse Source
This commit is contained in:
Dmitry Astapov 2025-03-05 21:06:55 +00:00 committed by Simon Michael
parent 4aa79cdc53
commit c354e6e9f7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hledger/Hledger/Cli/Commands/Run.hs
View File

@ -32,6 +32,7 @@ import Control.Monad (forM_)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Control.Monad.Extra (concatMapM) import Control.Monad.Extra (concatMapM)
import System.Exit (ExitCode)
import System.Console.CmdArgs.Explicit (expandArgsAt) import System.Console.CmdArgs.Explicit (expandArgsAt)
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import System.IO (stdin, hIsTerminalDevice) import System.IO (stdin, hIsTerminalDevice)
@ -161,7 +162,11 @@ runREPL defaultJournalOverride findBuiltinCommand = do
Just "exit" -> return () Just "exit" -> return ()
Just input -> do Just input -> do
liftIO $ (runCommand defaultJournalOverride findBuiltinCommand $ parseCommand input) liftIO $ (runCommand defaultJournalOverride findBuiltinCommand $ parseCommand input)
`catch` (\(e::ErrorCall) -> putStr $ show e) `catches`
[Handler (\(e::ErrorCall) -> putStr $ show e)
,Handler (\(_::ExitCode) -> return ())
,Handler (\UserInterrupt -> return ())
]
loop prompt loop prompt
-- | Cache of all journals that have been read by commands given to "run", -- | Cache of all journals that have been read by commands given to "run",