Merge branch 'releases/Release_2_11_1_4_debianpatches' into task/JAL-3521_Slimmed_dow...

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 3a238bb..19de95e 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -375,12 +375,17 @@ public class Jalview
         System.err.println("CMD [-noquestionnaire] executed successfully!");
       }
 
-      if (!aparser.contains("nonews"))
+      if (!aparser.contains("nonews")
+              || Cache.getProperty("NONEWS") == null)
       {
         desktop.checkForNews();
       }
 
-      BioJsHTMLOutput.updateBioJS();
+      if (!aparser.contains("nohtmltemplates")
+              || Cache.getProperty("NOHTMLTEMPLATES") == null)
+      {
+        BioJsHTMLOutput.updateBioJS();
+      }
     }
 
     // Move any new getdown-launcher-new.jar into place over old