From: Ben Soares Date: Thu, 28 Sep 2023 16:09:58 +0000 (+0100) Subject: JAL-4059 Try and avoid Commands Error in jalviewjs and desktop X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b568f2d34386b9fb939b6c10f96069788092a655;p=jalview.git JAL-4059 Try and avoid Commands Error in jalviewjs and desktop --- diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index b7d15e5..9df0226 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -837,36 +837,40 @@ public class Jalview } // Run Commands from cli - cmds = new Commands(argparser, headlessArg); - cmds.processArgs(); - boolean commandsSuccess = cmds.argsWereParsed(); - - if (commandsSuccess) + boolean commandsSuccess = false; + if (!(argparser.isMixedStyle() || argparser.isOldStyle())) { - if (headlessArg) + cmds = new Commands(argparser, headlessArg); + cmds.processArgs(); + commandsSuccess = cmds.argsWereParsed(); + + if (commandsSuccess) { - if (argparser.getBoolean(Arg.NOQUIT)) + if (headlessArg) { - Console.warn( - "Completed " + Arg.HEADLESS.getName() + " commands, but " - + Arg.NOQUIT + " is set so not quitting!"); - } - else - { - Jalview.exit("Successfully completed commands in headless mode", - ExitCode.OK); + if (argparser.getBoolean(Arg.NOQUIT)) + { + Console.warn("Completed " + Arg.HEADLESS.getName() + + " commands, but " + Arg.NOQUIT + + " is set so not quitting!"); + } + else + { + Jalview.exit("Successfully completed commands in headless mode", + ExitCode.OK); + } } + Console.info("Successfully completed commands"); } - Console.info("Successfully completed commands"); - } - else - { - if (headlessArg) + else { - Jalview.exit("Error when running Commands in headless mode", - ExitCode.ERROR_RUNNING_COMMANDS); + if (headlessArg) + { + Jalview.exit("Error when running Commands in headless mode", + ExitCode.ERROR_RUNNING_COMMANDS); + } + Console.warn("Error when running commands"); } - Console.warn("Error when running commands"); } // Check if JVM and compile version might cause problems and log if it @@ -1633,8 +1637,7 @@ public class Jalview PromptUserConfig prompter = new PromptUserConfig(Desktop.desktop, "USAGESTATS", MessageManager.getString("prompt.analytics_title"), - MessageManager.getString("prompt.analytics"), - new Runnable() + MessageManager.getString("prompt.analytics"), new Runnable() { @Override public void run()