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

help: drop --cat

Browse Source
This commit is contained in:
Simon Michael 2020-12-25 15:59:25 -08:00
parent ab55be6d64
commit 9beff54b27
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger/Hledger/Cli/Commands/Help.hs
View File

@ -39,7 +39,6 @@ helpmode = hledgerCommandMode
[flagNone ["info"] (setboolopt "info") "show the manual with info" [flagNone ["info"] (setboolopt "info") "show the manual with info"
,flagNone ["man"] (setboolopt "man") "show the manual with man" ,flagNone ["man"] (setboolopt "man") "show the manual with man"
,flagNone ["pager"] (setboolopt "pager") "show the manual with $PAGER or less" ,flagNone ["pager"] (setboolopt "pager") "show the manual with $PAGER or less"
,flagNone ["cat"] (setboolopt "cat") "show the manual on stdout"
,flagNone ["help","h"] (setboolopt "help") "show this help" ,flagNone ["help","h"] (setboolopt "help") "show this help"
] ]
[] []
@ -47,7 +46,7 @@ helpmode = hledgerCommandMode
([], Just $ argsFlag "[MANUAL]") ([], Just $ argsFlag "[MANUAL]")
-- | List or display one of the hledger manuals in various formats. -- | List or display one of the hledger manuals in various formats.
-- You can select a docs viewer with one of the `--info`, `--man`, `--pager`, `--cat` flags. -- You can select a docs viewer with one of the `--info`, `--man`, `--pager` flags.
-- Otherwise it will use the first available of: info, man, $PAGER, less, stdout -- Otherwise it will use the first available of: info, man, $PAGER, less, stdout
-- (and always stdout if output is non-interactive). -- (and always stdout if output is non-interactive).
help' :: CliOpts -> Journal -> IO () help' :: CliOpts -> Journal -> IO ()
@ -66,7 +65,6 @@ help' opts _ = do
| boolopt "info" $ rawopts_ opts = info | boolopt "info" $ rawopts_ opts = info
| boolopt "man" $ rawopts_ opts = man | boolopt "man" $ rawopts_ opts = man
| boolopt "pager" $ rawopts_ opts = pager | boolopt "pager" $ rawopts_ opts = pager
| boolopt "cat" $ rawopts_ opts = cat
| not interactive = cat | not interactive = cat
| "info" `elem` exes = info | "info" `elem` exes = info
| "man" `elem` exes = man | "man" `elem` exes = man
@ -75,7 +73,7 @@ help' opts _ = do
case topic of case topic of
Nothing -> putStrLn $ unlines [ Nothing -> putStrLn $ unlines [
"Please choose a manual by typing \"hledger help MANUAL\" (any substring is ok)." "Please choose a manual by typing \"hledger help MANUAL\" (any substring is ok)."
,"A viewer (info, man, a pager, or stdout) will be auto-selected," ,"A viewer (info, man, $PAGER, or stdout) will be auto-selected,"
,"or type \"hledger help -h\" to see options. Manuals available:" ,"or type \"hledger help -h\" to see options. Manuals available:"
] ]
++ "\n " ++ unwords docTopics ++ "\n " ++ unwords docTopics

2
hledger/Hledger/Cli/Commands/Help.md
View File

@ -9,7 +9,7 @@ Run it with no argument to list the manuals, or provide a full or partial manual
hledger manuals are available in several formats. hledger manuals are available in several formats.
hledger help will use the first of these display methods that it finds: hledger help will use the first of these display methods that it finds:
info, man, $PAGER, less, stdout (or when non-interactive, just stdout). info, man, $PAGER, less, stdout (or when non-interactive, just stdout).
You can force a particular viewer with the `--info`, `--man`, `--pager`, `--cat` flags. You can force a particular viewer with the `--info`, `--man`, `--pager` flags.
Examples: Examples: