From 9f4be220ec9450a669805117a30df98b7848b82c Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Sat, 18 Mar 2023 21:59:10 +0000 Subject: [PATCH] JAL-629 move getdown update to earlier stage --- src/jalview/bin/Jalview.java | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index fbbb16c..5f1f228 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -286,6 +286,25 @@ public class Jalview System.setSecurityManager(null); } + // Move any new getdown-launcher-new.jar into place over old + // getdown-launcher.jar + String appdirString = System.getProperty("getdownappdir"); + if (appdirString != null && appdirString.length() > 0) + { + final File appdir = new File(appdirString); + new Thread() + { + @Override + public void run() + { + LaunchUtil.upgradeGetdown( + new File(appdir, "getdown-launcher-old.jar"), + new File(appdir, "getdown-launcher.jar"), + new File(appdir, "getdown-launcher-new.jar")); + } + }.start(); + } + // get args needed before proper ArgParser BootstrapArgs bootstrapArgs = BootstrapArgs.getBootstrapArgs(args); @@ -672,25 +691,6 @@ public class Jalview + LaunchUtils.getJavaCompileVersion() + "."); } - // Move any new getdown-launcher-new.jar into place over old - // getdown-launcher.jar - String appdirString = System.getProperty("getdownappdir"); - if (appdirString != null && appdirString.length() > 0) - { - final File appdir = new File(appdirString); - new Thread() - { - @Override - public void run() - { - LaunchUtil.upgradeGetdown( - new File(appdir, "getdown-launcher-old.jar"), - new File(appdir, "getdown-launcher.jar"), - new File(appdir, "getdown-launcher-new.jar")); - } - }.start(); - } - String file = null, data = null; FileFormatI format = null; -- 1.7.10.2