From 02667cbe2627898fb2937f649015373a1d450de3 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 21 Jul 2011 09:48:30 +1000 Subject: samba-tool: Replace C version of samba-tool with python version C version of samba-tool is now called samba-tool-c, which will be removed as soon as all the samba-tool commands are ported to python. Signed-off-by: Andrew Tridgell --- source4/samba_tool/wscript_build | 2 +- source4/scripting/bin/samba-tool | 69 +++++++++++++++++++++++++++ source4/scripting/bin/wscript_build | 1 + source4/scripting/python/samba/samba-tool.py | 70 ---------------------------- source4/scripting/wscript_build | 2 +- 5 files changed, 72 insertions(+), 72 deletions(-) create mode 100755 source4/scripting/bin/samba-tool delete mode 100755 source4/scripting/python/samba/samba-tool.py diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build index 788f8dbf75..f378b51e05 100644 --- a/source4/samba_tool/wscript_build +++ b/source4/samba_tool/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_BINARY('samba-tool', +bld.SAMBA_BINARY('samba-tool-c', source='samba_tool.c vampire.c gpo.c', autoproto='proto.h', deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS samba-policy auth4', diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool new file mode 100755 index 0000000000..9735335af5 --- /dev/null +++ b/source4/scripting/bin/samba-tool @@ -0,0 +1,69 @@ +#!/usr/bin/env python + +# Unix SMB/CIFS implementation. +# Copyright (C) Amitay Isaacs 211 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +import sys + +# Find right direction when running from source tree +sys.path.insert(0, "bin/python") + +from samba import netcmd +from samba.netcmd import Command, CommandError, Option + +class MainCommand(Command): + """Main class for samba tool commands""" + + commands = {} + + def _run(self, myname, command=None, *args): + if command in self.commands: + return self.commands[command]._run(command, *args) + + print "Syntax: %s [options]" % (myname) + print "Available commands:" + for cmd in self.commands: + print " %-12s - %s" % (cmd, self.commands[cmd].description) + if command in [None, 'help', '-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: %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__': + cmd = cmd_sambatool() + + command = None + args = () + + if len(sys.argv) > 1: + command = sys.argv[1] + if len(sys.argv) > 2: + args = sys.argv[2:] + + cmd._run("samba-tool.py", command, *args) diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build index e52b32bc02..87387054b3 100644 --- a/source4/scripting/bin/wscript_build +++ b/source4/scripting/bin/wscript_build @@ -3,3 +3,4 @@ bld.SAMBA_SCRIPT('samba_dnsupdate', pattern='samba_dnsupdate', installdir='.') bld.SAMBA_SCRIPT('samba_spnupdate', pattern='samba_spnupdate', installdir='.') bld.SAMBA_SCRIPT('upgradeprovision', pattern='upgradeprovision', installdir='.') +bld.SAMBA_SCRIPT('samba-tool', pattern='samba-tool', installdir='.') diff --git a/source4/scripting/python/samba/samba-tool.py b/source4/scripting/python/samba/samba-tool.py deleted file mode 100755 index 494654a78d..0000000000 --- a/source4/scripting/python/samba/samba-tool.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python - -# Unix SMB/CIFS implementation. -# Copyright (C) Amitay Isaacs 211 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -import sys -from os.path import dirname - -samba_pymodule_dir = dirname(dirname(sys.argv[0])) -sys.path.append(samba_pymodule_dir) - -from samba import netcmd -from samba.netcmd import Command, CommandError, Option - -class MainCommand(Command): - """Main class for samba tool commands""" - - commands = {} - - def _run(self, myname, command=None, *args): - if command in self.commands: - return self.commands[command]._run(command, *args) - - print "Syntax: %s [options]" % (myname) - print "Available commands:" - for cmd in self.commands: - print " %-12s - %s" % (cmd, self.commands[cmd].description) - if command in [None, 'help', '-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: %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__': - cmd = cmd_sambatool() - - command = None - args = () - - if len(sys.argv) > 1: - command = sys.argv[1] - if len(sys.argv) > 2: - args = sys.argv[2:] - - cmd._run("samba-tool.py", command, *args) diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build index d94fc4fe9c..90f1f2f021 100644 --- a/source4/scripting/wscript_build +++ b/source4/scripting/wscript_build @@ -2,7 +2,7 @@ from samba_utils import MODE_755 -bld.INSTALL_FILES('${SBINDIR}','bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate', +bld.INSTALL_FILES('${SBINDIR}','bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba-tool', chmod=MODE_755, python_fixup=True, flat=True) bld.RECURSE('bin') -- cgit