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

cli: hledger ADDONCOMMAND --version now shows add-on command's version

Browse Source
This commit is contained in:
Simon Michael 2011-09-14 02:32:44 +00:00
parent 187a7a1cc7
commit 33f6277e0d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger/Hledger/Cli/Main.hs
View File

@ -69,8 +69,9 @@ main = do
run' opts addons args run' opts addons args
where where
run' opts@CliOpts{command_=cmd} addons args run' opts@CliOpts{command_=cmd} addons args
| "version" `in_` (rawopts_ opts) = putStrLn progversion -- delicate, eg ADDONCOMMAND --version; add tests before changing
| "binary-filename" `in_` (rawopts_ opts) = putStrLn $ binaryfilename progname | (null matchedaddon) && "version" `in_` (rawopts_ opts) = putStrLn progversion
| (null matchedaddon) && "binary-filename" `in_` (rawopts_ opts) = putStrLn $ binaryfilename progname
| null cmd = putStr $ showModeHelp mainmode' | null cmd = putStr $ showModeHelp mainmode'
| cmd `isPrefixOf` "add" = showModeHelpOr addmode $ journalFilePathFromOpts opts >>= ensureJournalFile >> withJournalDo opts add | cmd `isPrefixOf` "add" = showModeHelpOr addmode $ journalFilePathFromOpts opts >>= ensureJournalFile >> withJournalDo opts add
| cmd `isPrefixOf` "convert" = showModeHelpOr convertmode $ convert opts | cmd `isPrefixOf` "convert" = showModeHelpOr convertmode $ convert opts
@ -88,7 +89,8 @@ main = do
mainmode' = mainmode addons mainmode' = mainmode addons
showModeHelpOr mode f | "help" `in_` (rawopts_ opts) = putStr $ showModeHelp mode showModeHelpOr mode f | "help" `in_` (rawopts_ opts) = putStr $ showModeHelp mode
| otherwise = f | otherwise = f
matchedaddon = headDef "" $ filter (cmd `isPrefixOf`) addons matchedaddon | null cmd = ""
| otherwise = headDef "" $ filter (cmd `isPrefixOf`) addons
shellcmd = printf "%s-%s %s" progname matchedaddon (unwords' subcmdargs) shellcmd = printf "%s-%s %s" progname matchedaddon (unwords' subcmdargs)
subcmdargs = args1 ++ drop 1 args2 where (args1,args2) = break (== cmd) $ filter (/="--") args subcmdargs = args1 ++ drop 1 args2 where (args1,args2) = break (== cmd) $ filter (/="--") args