From: Ben Soares <b.soares@dundee.ac.uk>
Date: Wed, 22 Feb 2023 12:40:43 +0000 (+0000)
Subject: Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
X-Git-Tag: Release_2_11_4_0~485
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a7bc89415a6749ff89eb97f75fbc950a433a4935;p=jalview.git

Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
---

a7bc89415a6749ff89eb97f75fbc950a433a4935
diff --cc src/jalview/bin/Jalview.java
index e259cc2,c6aaaef..402235b
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -299,23 -332,13 +333,25 @@@ public class Jalvie
      // report Jalview version
      Cache.loadBuildProperties(true);
  
 +    // old ArgsParser
      ArgsParser aparser = new ArgsParser(args);
+ 
      boolean headless = false;
  
 +    try
 +    {
 +      Console.initLogger();
 +    } catch (NoClassDefFoundError error)
 +    {
 +      error.printStackTrace();
 +      System.out.println("\nEssential logging libraries not found."
 +              + "\nUse: java -classpath \"$PATH_TO_LIB$/*:$PATH_TO_CLASSES$\" jalview.bin.Jalview");
 +      System.exit(0);
 +    }
 +
      String usrPropsFile = aparser.getValue("props");
-     Cache.loadProperties(usrPropsFile); // must do this before
+     Cache.loadProperties(usrPropsFile); // must do this
+                                         // before
      if (usrPropsFile != null)
      {
        System.out.println(