*/
void doMain(String[] args)
{
-
if (!Platform.isJS())
{
System.setSecurityManager(null);
}
+ if (args == null)
+ args = new String[] {};
+
// Move any new getdown-launcher-new.jar into place over old
// getdown-launcher.jar
String appdirString = System.getProperty("getdownappdir");
// --argfile=... -- OVERRIDES ALL NON-BOOTSTRAP ARGS
if (bootstrapArgs.contains(Arg.ARGFILE))
{
- argparser = ArgParser
- .parseArgFiles(bootstrapArgs.getList(Arg.ARGFILE));
+ argparser = ArgParser.parseArgFiles(
+ bootstrapArgs.getList(Arg.ARGFILE),
+ bootstrapArgs.getBoolean(Arg.INITSUBSTITUTIONS));
}
else
{
- argparser = new ArgParser(args);
+ argparser = new ArgParser(args,
+ bootstrapArgs.getBoolean(Arg.INITSUBSTITUTIONS));
}
if (!Platform.isJS())
* @j2sIgnore
*/
{
- if (aparser.contains("help") || aparser.contains("h")
- || argparser.getBool(Arg.HELP))
+ if (bootstrapArgs.contains(Arg.HELP))
+ {
+ System.out.println(Arg.usage());
+ Jalview.exit(null, 0);
+ }
+ if (aparser.contains("help") || aparser.contains("h"))
{
showUsage();
Jalview.exit(null, 0);
}
// DISABLED FOR SECURITY REASONS
// TODO: add a property to allow properties to be overriden by cli args
- // Cache.setProperty(defs.substring(0,p), defs.substring(p+1));
+ // Cache.setProperty(setprop.substring(0,p), setprop.substring(p+1));
}
}
if (System.getProperty("java.awt.headless") != null
if (!(headless || headlessArg))
{
Desktop.nosplash = "false".equals(bootstrapArgs.get(Arg.SPLASH))
- || aparser.contains("nosplash");
+ || aparser.contains("nosplash")
+ || Cache.getDefault("SPLASH", "true").equals("false");
desktop = new Desktop();
desktop.setInBatchMode(true); // indicate we are starting up