From: Ben Soares Date: Mon, 29 Jul 2024 18:42:47 +0000 (+0100) Subject: JAL-3631 Getdown acknowledges in output when only performing an update X-Git-Tag: Release_2_11_4_0~17^2~3^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=240b3b52824a4c569e23a2110b2e93e25a3ceec4;p=jalview.git JAL-3631 Getdown acknowledges in output when only performing an update --- diff --git a/getdown/lib/FJVL_VERSION b/getdown/lib/FJVL_VERSION index f17be91..3f285ff 100644 --- a/getdown/lib/FJVL_VERSION +++ b/getdown/lib/FJVL_VERSION @@ -1 +1 @@ -1.8.3-1.5.1_FJVL +1.8.3-1.5.2_FJVL diff --git a/getdown/lib/JVL_VERSION b/getdown/lib/JVL_VERSION index 4f75493..bec905f 100644 --- a/getdown/lib/JVL_VERSION +++ b/getdown/lib/JVL_VERSION @@ -1 +1 @@ -1.8.3-1.5.1_JVL +1.8.3-1.5.2_JVL diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar index 6370946..d125cc7 100644 Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar index 2db45be..f982611 100644 Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar index 3cf11cc..ccfcaf0 100644 Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml index a234453..fbd94c2 100644 --- a/getdown/src/getdown/ant/pom.xml +++ b/getdown/src/getdown/ant/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.5.1_FJVL + 1.8.3-1.5.2_FJVL getdown-ant diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml index 6a9543b..c1236dd 100644 --- a/getdown/src/getdown/core/pom.xml +++ b/getdown/src/getdown/core/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.5.1_FJVL + 1.8.3-1.5.2_FJVL getdown-core diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml index b309163..43df5b8 100644 --- a/getdown/src/getdown/launcher/pom.xml +++ b/getdown/src/getdown/launcher/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.5.1_FJVL + 1.8.3-1.5.2_FJVL getdown-launcher diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java index 1283f11..bcb0f75 100644 --- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java +++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java @@ -65,7 +65,11 @@ public class GetdownApp public static Getdown start (String[] argv) throws Exception { jalview.util.ErrorLog.setHasConsole(false); jalview.util.ErrorLog.setPrefix("LAUNCHER: "); - jalview.util.ErrorLog.outPrintln("start of logging"); + if (SysProps.silent() && !SysProps.launchInSilent() && "true".equals(System.getProperty("launcher.update", "false"))) { + jalview.util.ErrorLog.outPrintln("Running update only"); + } else { + jalview.util.ErrorLog.outPrintln("Start of logging"); + } List notes = new ArrayList<>(); boolean append = false; EnvConfig envc = EnvConfig.create(argv, notes, GetdownApp.class); diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd index d1a6599..2e9e31f 100755 --- a/getdown/src/getdown/mvn_cmd +++ b/getdown/src/getdown/mvn_cmd @@ -3,7 +3,7 @@ if [ x$JVLVERSION != x ]; then export VERSION=$JVLVERSION else - export VERSION=1.8.3-1.5.1_JVL + export VERSION=1.8.3-1.5.2_JVL fi if [ x${VERSION%_JVL} = x$VERSION ]; then diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml index 9b8140e..7a05651 100644 --- a/getdown/src/getdown/pom.xml +++ b/getdown/src/getdown/pom.xml @@ -10,7 +10,7 @@ com.threerings.getdown getdown pom - 1.8.3-1.5.1_FJVL + 1.8.3-1.5.2_FJVL getdown An application installer and updater. diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar index 6370946..d125cc7 100644 Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar index 6370946..d125cc7 100644 Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ