input = prompt.make(old_options.prompt, old_options.non_interactive)
- if len(args) < 1:
- # XXX: Obviously not correct ;-)
- appstr = "mediawiki"
- else:
- appstr = args[0]
-
- first_time = True
- locker = None
- # XXX: this is kind of grody
- while 1:
- if len(args) < 2:
- # XXX: Scripts specific
- if first_time:
- type = input.menu("""
-Who are you performing this install for? If you don't know, select 1.""", cmdopt="directory",
- choices=[
- ("1", "Your personal Athena account"),
- ("2", "A locker you control (i.e. a club or course)"),
- ])
- if type == "1":
- locker = os.getenv("ATHENA_USER") or os.getenv("USER")
- else:
- locker = input.inputbox("""
-Enter the name of the selected locker that you control. For locker /mit/lsc, you would simply enter lsc.
-
-Locker name:""")
- # XXX: check for control/existence of locker.
- # fi
- path = input.inputbox("""
-Your new install will appear on the web at a URL that starts with \
-http://%s.scripts.mit.edu/. Please decide on a complete URL and \
-enter it below. You must enter one or more characters after mit.edu. \
-The completed address must contain only a-z, 0-9 and /.
+ appstr = args[0]
+ dir = os.path.abspath(args[1])
-Desired address:""" % locker, init="http://%s.scripts.mit.edu/" % locker)
- dir = os.path.join("/mit", locker, "web_scripts", path)
- else:
- dir = args[1]
-
- if os.path.exists(dir):
- if locker:
- input.msgbox("Directory already exists; please select another address or delete the old directory.")
- first_time = False
- continue
- raise DirectoryExistsError
- break
+ if not old_options.retry and not old_options.help and os.path.exists(dir) and os.listdir(dir):
+ raise DirectoryExistsError
appname, _, version = appstr.partition('-')
application = app.applications()[appname]
# get configuration
schema = application.install_schema
+ schema.commit(application, dir)
options = None
+ opthandler = installopt.Controller(dir, schema)
+ parser = command.WizardOptionParser("""usage: %%prog install %s DIR [ -- SETUPARGS ]
+
+Autoinstalls the application %s in the directory DIR.""" % (appname, appname))
+ configure_parser(parser, baton)
+ opthandler.push(parser)
+ if old_options.help:
+ parser.print_help()
+ sys.exit(1)
+ ihandler = interactive.Controller(dir, schema, input)
+ options, _ = parser.parse_all(args[2:] + command.make_base_args(old_options))
if old_options.non_interactive:
- handler = installopt.Controller(dir, schema)
- parser = command.WizardOptionParser()
- handler.push(parser)
- options, _ = parser.parse_all(args[2:] + command.make_base_args(old_options)) # accumulate
- handler.handle(options)
+ opthandler.handle(options)
else:
- handler = interactive.Controller(dir, schema, input)
- handler.ask(old_options)
- options = old_options
+ ihandler.ask(options)
- sh = shell.Shell()
input.infobox("Copying files (this may take a while)...")
- sh.call("git", "clone", "-q", "--shared", application.repository(old_options.srv_path), dir)
+ if not os.path.exists(dir):
+ shell.call("git", "clone", "-q", "--shared", application.repository(old_options.srv_path), dir)
with util.ChangeDirectory(dir):
- if version:
- # XXX: do something smart if -scripts is not at the end
- sh.call("git", "reset", "-q", "--hard", appstr)
+ if not old_options.retry and version and version != "head-scripts": # for ease in testing
+ shell.call("git", "reset", "-q", "--hard", appstr)
input.infobox("Installing...")
application.install(distutils.version.LooseVersion(version), options)
- git.commit_configure()
- input.infobox("Congratulations, your new install is now accessible at http://%s%s" % (options.web_host, options.web_path))
-
-def parse_args(argv, baton):
- usage = """usage: %prog install [APP [DIR -- [SETUPARGS]]]
+ if not old_options.no_commit:
+ git.commit_configure()
+ if not hasattr(options, "web_inferred"):
+ open(os.path.join(dir, ".scripts/url"), "w").write("http://%s%s" % (options.web_host, options.web_path)) # XXX: no support for https yet!
+ input.infobox("Congratulations, your new install is now accessible at:\n\nhttp://%s%s" % (options.web_host, options.web_path), width=80)
-Autoinstalls the application APP in the directory
-DIR. SETUPARGS are arguments that are passed to
-'wizard configure', see 'wizard configure APP --help'
-for possible arguments. If arguments are missing
-this command will interactively ask for them.
-"""
- parser = command.WizardOptionParser(usage)
+def configure_parser(parser, baton):
parser.add_option("--prompt", dest="prompt", action="store_true",
default=False, help="Force to use non-ncurses interactive interface")
parser.add_option("--non-interactive", dest="non_interactive", action="store_true",
- default=False, help="Force program to be non-interactive")
+ default=False, help="Force program to be non-interactive and use SETUPARGS. Use --help with APP to find argument names.")
+ parser.add_option("--no-commit", dest="no_commit", action="store_true",
+ default=command.boolish(os.getenv("WIZARD_NO_COMMIT")), help="Do not generate an 'installation commit' after configuring the application. Envvar is WIZARD_NO_COMMIT")
+ parser.add_option("--retry", dest="retry", action="store_true",
+ default=False, help="Do not complain if directory already exists and reinstall application.")
baton.push(parser, "srv_path")
- return parser.parse_all(argv)
+
+def parse_args(argv, baton):
+ usage = """usage: %prog install APP DIR [ -- SETUPARGS ]
+
+Autoinstalls the application APP in the directory DIR.
+This command will interactively ask for information to
+complete the autoinstall.
+
+You can also use --help with APP and DIR to find out what
+are required SETUPARGS if you want to run this non-interactively
+(the distribution of required and optional arguments may change
+depending on what directory you are installing to.)"""
+ parser = command.WizardOptionParser(usage, store_help=True)
+ configure_parser(parser, baton)
+ options, args = parser.parse_all(argv)
+ if options.help:
+ if len(args) == 0:
+ parser.print_help()
+ sys.exit(1)
+ elif len(args) == 1:
+ args.append(os.getcwd())
+ else:
+ if len(args) < 2:
+ parser.error("not enough arguments")
+ return options, args
class DirectoryExistsError(wizard.Error):
def __str__(self):
- return "Directory already exists"
+ return "Directory already exists and is not empty"
scripts.mit.edu / wizard.git / blobdiff