From faf8cede245d19a9af3f62ea9fd576f3b2ba294c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Mar 2012 12:14:45 -0400 Subject: fix option order in usage display --- Usage.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Usage.hs b/Usage.hs index 59223daae..b1de930ef 100644 --- a/Usage.hs +++ b/Usage.hs @@ -29,8 +29,8 @@ usage header cmds commonoptions = unlines $ -- be displayed after the command. alloptlines = filter (not . null) $ lines $ usageInfo "" $ - concatMap cmdoptions cmds ++ commonoptions - (cmdlines, optlines) = go (sort cmds) alloptlines [] + concatMap cmdoptions scmds ++ commonoptions + (cmdlines, optlines) = go scmds alloptlines [] go [] os ls = (ls, os) go (c:cs) os ls = go cs os' (ls++(l:o)) where @@ -46,6 +46,7 @@ usage header cmds commonoptions = unlines $ namepad = pad $ longest cmdname + 1 descpad = pad $ longest cmdparamdesc + 2 longest f = foldl max 0 $ map (length . f) cmds + scmds = sort cmds {- Descriptions of params used in usage messages. -} paramPaths :: String -- cgit v1.2.3