diff options
| -rwxr-xr-x | source4/scripting/bin/samba-tool | 36 | ||||
| -rw-r--r-- | source4/scripting/python/samba/netcmd/__init__.py | 9 |
2 files changed, 12 insertions, 33 deletions
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool index 7d662308a2..ba792fb886 100755 --- a/source4/scripting/bin/samba-tool +++ b/source4/scripting/bin/samba-tool @@ -23,41 +23,15 @@ import sys sys.path.insert(0, "bin/python") from samba import netcmd -from samba.netcmd import Command, CommandError +from samba.netcmd import SuperCommand -class MainCommand(Command): - """Main class for samba tool commands""" - commands = {} +class cmd_sambatool(SuperCommand): + """samba-tool SuperCommand""" + + subcommands = netcmd.commands - def _run(self, myname, command=None, *args): - if command in self.commands: - return self.commands[command]._run(command, *args) - print "Usage: samba-tool <command> [options]" - print "Available commands:" - cmds = self.commands.keys() - cmds.sort() - for cmd in cmds: - print " %-16s - %s" % (cmd, self.commands[cmd].description) - if command in [None]: - raise CommandError("You must specify a command") - if command in ['help', '-h', '--help']: - print "For more help on a specific command, please type: samba-tool <command> (-h|--help)" - return 0 - raise CommandError("No such command '%s'" % command) - - def usage(self, myname, command=None, *args): - if command is None or not command in self.commands: - print "Usage: samba-tool %s (%s) [options]" % (myname, - " | ".join(self.commands.keys())) - else: - return self.commands[command].usage(*args) - - -class cmd_sambatool(MainCommand): - """Samba Tool Commands""" - commands = netcmd.commands if __name__ == '__main__': diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index 12e6a99b4d..360134644b 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -148,7 +148,12 @@ class SuperCommand(Command): def _run(self, myname, subcommand=None, *args): if subcommand in self.subcommands: return self.subcommands[subcommand]._run(subcommand, *args) - print "Usage: samba-tool %s <subcommand> [options]" % myname + + if (myname == "samba-tool"): + usage = "samba-tool <subcommand>" + else: + usage = "samba-tool %s <subcommand>" % myname + print "Usage: %s [options]" %usage print "Available subcommands:" subcmds = self.subcommands.keys() subcmds.sort() @@ -157,7 +162,7 @@ class SuperCommand(Command): if subcommand in [None]: raise CommandError("You must specify a subcommand") if subcommand in ['help', '-h', '--help']: - print "For more help on a specific subcommand, please type: samba-tool %s <subcommand> (-h|--help)" % myname + print "For more help on a specific subcommand, please type: %s (-h|--help)" % usage return 0 raise CommandError("No such subcommand '%s'" % subcommand) |