mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix option order in usage display

Browse source
This commit is contained in:
Joey Hess 2012-03-15 12:14:45 -04:00
parent d2769cf795
commit faf8cede24
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Usage.hs
View file

@ -29,8 +29,8 @@ usage header cmds commonoptions = unlines $
-- be displayed after the command. -- be displayed after the command.
alloptlines = filter (not . null) $ alloptlines = filter (not . null) $
lines $ usageInfo "" $ lines $ usageInfo "" $
concatMap cmdoptions cmds ++ commonoptions concatMap cmdoptions scmds ++ commonoptions
(cmdlines, optlines) = go (sort cmds) alloptlines [] (cmdlines, optlines) = go scmds alloptlines []
go [] os ls = (ls, os) go [] os ls = (ls, os)
go (c:cs) os ls = go cs os' (ls++(l:o)) go (c:cs) os ls = go cs os' (ls++(l:o))
where where
@ -46,6 +46,7 @@ usage header cmds commonoptions = unlines $
namepad = pad $ longest cmdname + 1 namepad = pad $ longest cmdname + 1
descpad = pad $ longest cmdparamdesc + 2 descpad = pad $ longest cmdparamdesc + 2
longest f = foldl max 0 $ map (length . f) cmds longest f = foldl max 0 $ map (length . f) cmds
scmds = sort cmds
{- Descriptions of params used in usage messages. -} {- Descriptions of params used in usage messages. -}
paramPaths :: String paramPaths :: String