[[ Installer ]] Add 'installer command line' environment and use in installer stack

livecodeali · livecodeali · commit e6d195ebb979 · 2017-01-19T13:04:46.000Z
The installer stack was explicitly handing the 'noui' command line option.
This patch adds an 'installer command line' environment value which is true
if -ui is passed as an argument to the executable, so that faceless install
depends on the environment, for consistency with development mode.
diff --git a/builder/installer.rev b/builder/installer.rev
diff --git a/engine/src/mcstring.cpp b/engine/src/mcstring.cpp
@@ -218,6 +218,7 @@ MCNameRef MCN_development;
 MCNameRef MCN_development_cmdline;
 MCNameRef MCN_helper_application;
 MCNameRef MCN_installer;
+MCNameRef MCN_installer_cmdline;
 MCNameRef MCN_mobile;
 MCNameRef MCN_player;
 MCNameRef MCN_server;
@@ -689,6 +690,7 @@ void MCU_initialize_names(void)
     /* UNCHECKED */ MCNameCreateWithCString("development command line", MCN_development_cmdline);
 	/* UNCHECKED */ MCNameCreateWithCString("helper application", MCN_helper_application);
 	/* UNCHECKED */ MCNameCreateWithCString("installer", MCN_installer);
+    /* UNCHECKED */ MCNameCreateWithCString("installer command line", MCN_installer_cmdline);
 	/* UNCHECKED */ MCNameCreateWithCString("mobile", MCN_mobile);
 	/* UNCHECKED */ MCNameCreateWithCString("player", MCN_player);
 	/* UNCHECKED */ MCNameCreateWithCString("server", MCN_server);
@@ -1155,6 +1157,7 @@ void MCU_finalize_names(void)
     MCNameDelete(MCN_development_cmdline);
 	MCNameDelete(MCN_helper_application);
 	MCNameDelete(MCN_installer);
+	MCNameDelete(MCN_installer_cmdline);
 	MCNameDelete(MCN_mobile);
 	MCNameDelete(MCN_player);
 	MCNameDelete(MCN_server);
diff --git a/engine/src/mcstring.h b/engine/src/mcstring.h
@@ -169,6 +169,7 @@ extern MCNameRef MCN_development;
 extern MCNameRef MCN_development_cmdline;
 extern MCNameRef MCN_helper_application;
 extern MCNameRef MCN_installer;
+extern MCNameRef MCN_installer_cmdline;
 extern MCNameRef MCN_mobile;
 extern MCNameRef MCN_player;
 extern MCNameRef MCN_server;
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -1472,10 +1472,12 @@ IO_stat MCModeCheckSaveStack(MCStack *sptr, const MCStringRef filename)
 	return IO_NORMAL;
 }
 
-// In standalone mode, the environment depends on various command-line/runtime
-// globals.
+// In installer mode, the environment depends on the command line args
 MCNameRef MCModeGetEnvironment(void)
 {
+    if (MCnoui)
+        return MCN_installer_cmdline;
+    
 	return MCN_installer;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1472,10 +1472,12 @@ IO_stat MCModeCheckSaveStack(MCStack *sptr, const MCStringRef filename)`
`1472`	`1472`	`return IO_NORMAL;`
`1473`	`1473`	`}`
`1474`	`1474`
`1475`		`-// In standalone mode, the environment depends on various command-line/runtime`
`1476`		`-// globals.`
	`1475`	`+// In installer mode, the environment depends on the command line args`
`1477`	`1476`	`MCNameRef MCModeGetEnvironment(void)`
`1478`	`1477`	`{`
	`1478`	`+ if (MCnoui)`
	`1479`	`+ return MCN_installer_cmdline;`
	`1480`	`+`
`1479`	`1481`	`return MCN_installer;`
`1480`	`1482`	`}`
`1481`	`1483`