Merge git://github.com/esby/mw

[mw] / src / mw / cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 50327cd6883e414c03cae0ca3f5c301336582ada..52df23b658101c7a7d909e6c1ed8ad3466fc03c8 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -45,7 +45,9 @@ class CLI(object):
     def usage(self):
         print 'usage: %s [subcommand]' % self.me
         print
-        for name in self.commands:
+        commands = self.commands.keys()
+        commands.sort()
+        for name in commands:
             cmd = self.commands[name]
             if len(cmd.shortcuts) > 0:
                 full = name + ' (' + ' '.join(cmd.shortcuts) + ')'
@@ -60,7 +62,7 @@ class CLI(object):
         if len(sys.argv) > 1:
             if sys.argv[1] in self.all_commands:
                 the_command = sys.argv[1] # SWEET ACTION
-            elif sys.argv[1] in ['--help', '-h']:
+            elif sys.argv[1] in ['--help', '-h', 'help']:
                 self.usage()
             else:
                 print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])