X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/f5846ccc4228fab747eebc991ea97fd3238aea39..19cab7e9c748f20a3fc0120b98ca20abca6236e0:/src/mw/cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index 50327cd..52df23b 100644
--- 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])