mirror of
https://github.com/ganelson/inform.git
synced 2024-07-01 06:24:58 +03:00
Allow use of the -dry command line option with -confirmed
This commit is contained in:
parent
4171e2ffc4
commit
9aa9e86cd9
|
@ -114,7 +114,9 @@ error in this case.
|
||||||
|
|
||||||
@<Perform an extension installation@> =
|
@<Perform an extension installation@> =
|
||||||
Supervisor::go_operational();
|
Supervisor::go_operational();
|
||||||
ExtensionInstaller::install(to_install, confirmed, path_to_inbuild);
|
int use = SHELL_METHODOLOGY;
|
||||||
|
if (dry_run_mode) use = DRY_RUN_METHODOLOGY;
|
||||||
|
ExtensionInstaller::install(to_install, confirmed, path_to_inbuild, use);
|
||||||
|
|
||||||
@<Document from a file@> =
|
@<Document from a file@> =
|
||||||
if (documentation_dest == NULL)
|
if (documentation_dest == NULL)
|
||||||
|
|
|
@ -45,7 +45,7 @@ the Installer is called again, with |confirmed| true. It takes action and also
|
||||||
produces a second report.
|
produces a second report.
|
||||||
|
|
||||||
=
|
=
|
||||||
void ExtensionInstaller::install(inbuild_copy *C, int confirmed, pathname *to_tool) {
|
void ExtensionInstaller::install(inbuild_copy *C, int confirmed, pathname *to_tool, int meth) {
|
||||||
inform_project *project = Supervisor::project_set_at_command_line();
|
inform_project *project = Supervisor::project_set_at_command_line();
|
||||||
if (project == NULL) Errors::fatal("-project not set at command line");
|
if (project == NULL) Errors::fatal("-project not set at command line");
|
||||||
TEMPORARY_TEXT(pname)
|
TEMPORARY_TEXT(pname)
|
||||||
|
@ -332,8 +332,7 @@ void ExtensionInstaller::install(inbuild_copy *C, int confirmed, pathname *to_to
|
||||||
}
|
}
|
||||||
|
|
||||||
@<Make confirmed report@> =
|
@<Make confirmed report@> =
|
||||||
int use = SHELL_METHODOLOGY;
|
build_methodology *BM = BuildMethodology::new(Pathnames::up(to_tool), TRUE, meth);
|
||||||
build_methodology *BM = BuildMethodology::new(Pathnames::up(to_tool), TRUE, use);
|
|
||||||
Copies::copy_to(C, Projects::materials_nest(project), TRUE, BM);
|
Copies::copy_to(C, Projects::materials_nest(project), TRUE, BM);
|
||||||
HTML_OPEN("p");
|
HTML_OPEN("p");
|
||||||
WRITE("This extension has now been installed in the materials folder for %S, as:", pname);
|
WRITE("This extension has now been installed in the materials folder for %S, as:", pname);
|
||||||
|
|
Loading…
Reference in a new issue