Use convenience function for finding setup_dir based on location of

[ira/wip.git] / source4 / setup / upgrade

diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 22090b8cc673dcf2d42256e0d5ecf73d2067b31a..3d1316949f729e11567d33f9eb0b8fcd46b786f1 100755 (executable)
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -1,90 +1,83 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-       Upgrade from Samba3
-       Copyright Jelmer Vernooij 2005
-       Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-               "POPT_AUTOHELP",
-               "POPT_COMMON_SAMBA",
-               "POPT_COMMON_VERSION",
-               'ldif',
-               'quiet', 'blank');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-libinclude("base.js");
-libinclude("provision.js");
-libinclude("upgrade.js");
-
-/*
-  print a message if quiet is not set
-*/
-function message() 
-{
-       if (options["quiet"] == undefined) {
-               print(vsprintf(arguments));
-       }
-}
-
-function ldifprint(data)
-{
-       if (options.ldif != undefined) {
-               print(data);
-       }
-}
-
-/*
- show some help
-*/
-function ShowHelp()
-{
-       print("
-Samba4 import tool
-
-provision [options] <libdir> <smbconf>
- --ldif                                Dump LDIF
- --quiet                       Be quiet
- --blank                       do not add users or groups, just the structure
-
-You must provide at least a realm and domain
-
-");
-       exit(1);
-}
-
-if (options.ARGV.length != 2) {
-       ShowHelp();
-       exit(1);
-}
-
-var lp = loadparm_init();
-
-message("Reading Samba3 databases and smb.conf\n");
-var samba3 = samba3_read(options.ARGV[0], options.ARGV[1]);
-
-if (samba3 == undefined) {
-       println("Error reading Samba3 data");
-       exit(1);
-}
-
-message("Writing smb.conf\n");
-var smbconf = upgrade_smbconf(samba3);
-// FIXME: Write!
-
-message("Provisioning\n");
-var subobj = upgrade_provision(samba3);
-provision(subobj, message, options.blank);
-
-var ret = upgrade(subobj,samba3,message);
-if (ret > 0) {
-       message("Failed to import %d entries\n", ret);
-} else {
-       message("All OK\n");
-}
-return 0;
+#!/usr/bin/python
+#
+# Upgrade from Samba3
+# Copyright Jelmer Vernooij 2005-2007
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+import getopt
+import optparse
+import os, sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
+import samba
+import samba.getopt as options
+from samba import param
+from samba.auth import system_session
+
+parser = optparse.OptionParser("upgrade [options] <libdir> <smbconf>")
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option_group(options.VersionOptions(parser))
+credopts = options.CredentialsOptions(parser)
+parser.add_option_group(credopts)
+parser.add_option("--setupdir", type="string", metavar="DIR", 
+               help="directory with setup files")
+parser.add_option("--realm", type="string", metavar="REALM", help="set realm")
+parser.add_option("--quiet", help="Be quiet")
+parser.add_option("--blank", 
+               help="do not add users or groups, just the structure")
+parser.add_option("--targetdir", type="string", metavar="DIR", 
+                         help="Set target directory")
+
+opts, args = parser.parse_args()
+
+def message(text):
+    """Print a message if quiet is not set."""
+    if opts.quiet:
+        print text
+
+if len(args) < 1:
+    parser.print_usage()
+    sys.exit(1)
+from samba.samba3 import Samba3
+message("Reading Samba3 databases and smb.conf\n")
+libdir = args[0]
+if not os.path.isdir(libdir):
+    print "error: %s is not a directory"
+    sys.exit(1)
+if len(args) > 1:
+    smbconf = args[1]
+else:
+    smbconf = os.path.join(libdir, "smb.conf")
+samba3 = Samba3(libdir, smbconf)
+
+from samba.provision import find_setup_dir
+from samba.upgrade import upgrade_provision
+
+message("Provisioning\n")
+
+setup_dir = opts.setupdir
+if setup_dir is None:
+       setup_dir = find_setup_dir()
+
+lp = sambaopts.get_loadparm()
+smbconf = lp.configfile
+creds = credopts.get_credentials(lp)
+
+upgrade_provision(samba3, setup_dir, message, credentials=creds, 
+                         session_info=system_session(), smbconf=smbconf, 
+                                 targetdir=opts.targetdir)