From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 18 Mar 2022 18:12:17 +0000 (+0000)
Subject: JAL-3978 Using getdowninstanceappdir and getdowninstanceappbase to avoid conflict... 
X-Git-Tag: Release_2_11_2_6~64^2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=993745a73b9f0660fb6d0fa263c13673158d1130;p=jalview.git

JAL-3978 Using getdowninstanceappdir and getdowninstanceappbase to avoid conflict with getAppbaseBuildProperties(). Added an if around fetching build_properties to avoid failing to fetch local file appbase.
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 6a5badf..5c98d23 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 b7af0b6..b022d9f 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 02d31cc..b9e3c6b 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 36a8119..9d9fe14 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1085,8 +1085,8 @@ public class Application
 	    log.info("Not setting proxy");
 	}
 
-        // add the getdownappbase property.  getdownappdir is added by getdown.txt
-        args.add("-Dgetdownappbase=" + getAppbase().toString());
+        // add the getdowninstanceappbase property.  getdownappdir is added by getdown.txt
+        args.add("-Dgetdowninstanceappbase=" + getAppbase().toString());
 
         // add the marker indicating the app is running in getdown
         args.add("-D" + Properties.GETDOWN + "=true");
diff --git a/gradle.properties b/gradle.properties
index fb925b5..2db8989 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -82,7 +82,7 @@ getdown_txt_max_concurrent_downloads = 10
 # now got better (dynamic) defaults when jvmmem* not set
 #getdown_txt_jalview.jvmmempc = 90
 #getdown_txt_jalview.jvmmemmax = 32G
-getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
+getdown_txt_multi_jvmarg = -Dgetdowninstanceappdir=%APPDIR%
 getdown_txt_strict_comments = true
 getdown_txt_ui.progress_sync_before_shown = true
 getdown_txt_ui.progress_sync_after_shown = false
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 6a5badf..5c98d23 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 6a5badf..5c98d23 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 22a6b69..0ec0e78 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -518,25 +518,29 @@ public class Cache
                     + orgtimeout + " seconds.");
           }
           String remoteVersion = null;
-          try
+          if (remoteBuildPropertiesUrl.startsWith("http"))
           {
-            System.setProperty("sun.net.client.defaultConnectTimeout",
-                    "5000");
-            java.net.URL url = new java.net.URL(remoteBuildPropertiesUrl);
+            try
+            {
+              System.setProperty("sun.net.client.defaultConnectTimeout",
+                      "5000");
 
-            BufferedReader in = new BufferedReader(
-                    new InputStreamReader(url.openStream()));
+              URL url = new URL(remoteBuildPropertiesUrl);
 
-            Properties remoteBuildProperties = new Properties();
-            remoteBuildProperties.load(in);
-            remoteVersion = remoteBuildProperties.getProperty("VERSION");
-          } catch (Exception ex)
-          {
-            System.out
-                    .println("Non-fatal exception when checking version at "
-                            + remoteBuildPropertiesUrl + ":");
-            System.out.println(ex);
-            remoteVersion = getProperty("VERSION");
+              BufferedReader in = new BufferedReader(
+                      new InputStreamReader(url.openStream()));
+
+              Properties remoteBuildProperties = new Properties();
+              remoteBuildProperties.load(in);
+              remoteVersion = remoteBuildProperties.getProperty("VERSION");
+            } catch (Exception ex)
+            {
+              System.out.println(
+                      "Non-fatal exception when checking version at "
+                              + remoteBuildPropertiesUrl + ":");
+              System.out.println(ex);
+              remoteVersion = getProperty("VERSION");
+            }
           }
           System.setProperty("sun.net.client.defaultConnectTimeout",
                   orgtimeout);
@@ -1207,9 +1211,9 @@ public class Cache
       appendIfNotNull(sb, "Channel: ",
               ChannelProperties.getProperty("channel"), "\n", null);
       appendIfNotNull(sb, "Getdown appdir: ",
-              System.getProperty("getdownappdir"), "\n", null);
+              System.getProperty("getdowninstanceappdir"), "\n", null);
       appendIfNotNull(sb, "Getdown appbase: ",
-              System.getProperty("getdownappbase"), "\n", null);
+              System.getProperty("getdowninstanceappbase"), "\n", null);
       appendIfNotNull(sb, "Java home: ", System.getProperty("java.home"),
               "\n", "unknown");
     }