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

imp:setup: tidier output for missing LEDGER_FILE or default file

Browse Source
This commit is contained in:
Simon Michael 2025-11-17 22:22:09 -10:00
parent 4087e72683
commit 5849c78538
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hledger/Hledger/Cli/Commands/Setup.hs
View File

@ -358,7 +358,7 @@ setupJournal meconf = do
-- i Y "" -- i Y ""
pdesc "a default journal file is readable ?" pdesc "a default journal file is readable ?"
jfile <- defaultJournalPath ef <- defaultJournalPathSafely
-- let -- let
-- args = concat [ -- args = concat [
-- ["print"], -- ["print"],
@ -368,10 +368,12 @@ setupJournal meconf = do
-- (exit, _, err) <- readProcessWithExitCode progname args "" -- (exit, _, err) <- readProcessWithExitCode progname args ""
-- XXX can this ignore assertions and config files, like the above ? -- XXX can this ignore assertions and config files, like the above ?
ej <- defaultJournalSafely ej <- defaultJournalSafely
case ej of let trim s = either (const s) id $ regexReplace (toRegex' "^Error: ") "" s
Left estr -> p N (jfile <> ":\n" <> estr) case (ef, ej) of
Right j@Journal{..} -> do (Left err, _) -> p N $ trim err
p Y jfile (Right f, Left err) -> p N (f <> ":\n" <> trim err)
(Right f, Right j@Journal{..}) -> do
p Y f
pdesc "it includes additional files ?" pdesc "it includes additional files ?"
let numfiles = length jfiles let numfiles = length jfiles