From ac27365b5f1d322f15f75f5765f74e2c06dc786f Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Sat, 20 May 2023 17:53:46 +0100 Subject: [PATCH 1/1] JAL-4187 JAL-629 JAL-3830 small adjustments after further testing in Windows --- src/jalview/bin/Launcher.java | 6 ++---- src/jalview/bin/argparser/Arg.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java index 2155f8d..f29e0a1 100644 --- a/src/jalview/bin/Launcher.java +++ b/src/jalview/bin/Launcher.java @@ -121,10 +121,8 @@ public class Launcher { launcherwait = true; } - // these quite immediately - if (arg.equals("--version") || arg.equals("--help") - || arg.startsWith("--help-") - || (debug && arg.equals("--launchernowait"))) + // this ends the launcher immediately + if (debug && arg.equals("--launchernowait")) { wait = false; } diff --git a/src/jalview/bin/argparser/Arg.java b/src/jalview/bin/argparser/Arg.java index 2a080fc..8003245 100644 --- a/src/jalview/bin/argparser/Arg.java +++ b/src/jalview/bin/argparser/Arg.java @@ -197,7 +197,8 @@ public enum Arg "Move on to a new alignment window. This will ensure --append will start a new alignment window and other linked arguments will apply to the new alignment window.", Opt.UNARY, Opt.MULTI, Opt.NOACTION, Opt.INCREMENTDEFAULTCOUNTER), SUBSTITUTIONS(Type.FLOW, - "The following argument values allow (or don't allow) subsituting filename parts. This is initially true. Valid substitutions are {basename} - the filename-without-extension of the currently --opened file (or first --appended file),\n" + "The following argument values allow (or don't allow) subsituting filename parts. This is initially true. Valid substitutions are:\n" + + "{basename} - the filename-without-extension of the currently --opened file (or first --appended file),\n" + "{dirname} - the directory (folder) name of the currently --opened file (or first --appended file),\n" + "{argfilebasename} - the filename-without-extension of the current --argfile,\n" + "{argfiledirname} - the directory (folder) name of the current --argfile,\n" -- 1.7.10.2