From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 28 Jun 2024 15:53:16 +0000 (+0100)
Subject: JAL-3631 Change in user path for locally installed Jalview to avoid collision with... 
X-Git-Tag: Release_2_11_4_0~24^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a5b64ff2533e26a8c342dc323f8f34c12e1db496;p=jalview.git

JAL-3631 Change in user path for locally installed Jalview to avoid collision with old installation. Tidy a null check for Java Console output
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 6d9694c..d5fc86a 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 41c70d6..c59986e 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 925aa3d..ea3700a 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/EnvConfig.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
index 219c333..0342f70 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
@@ -418,7 +418,7 @@ public final class EnvConfig {
       osAppDataPathMap = new HashMap<>();
       osAppDataPathMap.put("macos", "Library/Application Support/Jalview-Desktop");
       osAppDataPathMap.put("linux", ".local/share/jalview-desktop");
-      osAppDataPathMap.put("windows", "AppData\\Local");
+      osAppDataPathMap.put("windows", "AppData\\Local\\Jalview-Desktop");
       osAppDataPathMap.put("other", ".jalview-desktop");
     }
 }
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 6d9694c..d5fc86a 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 6d9694c..d5fc86a 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 d98395b..a45fc42 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1292,10 +1292,6 @@ public class Cache
                   "Could not get canonical path for installer appdir, leaving as is.");
         }
       }
-      else
-      {
-        installerAppdir = "null: " + installerAppdir;
-      }
       appendIfNotNull(sb, "Installer template version: ",
               System.getProperty("installer.template_version"), "\n", null);
       appendIfNotNull(sb, "Installer appdir: ", installerAppdir, "\n",