From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 14 Sep 2021 12:36:11 +0000 (+0100)
Subject: JAL-2422 Also look in ~/Applications for ChimeraX on macOS
X-Git-Tag: Release_2_11_2_0~37^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=db42c5bc746393416ad7d2a9b3244761872435e3;p=jalview.git

JAL-2422 Also look in ~/Applications for ChimeraX on macOS
---

diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
index 9078d12..0a248cf 100644
--- a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
@@ -1040,9 +1040,15 @@ public class StructureManager
         pathList.add(
                 String.format("/Applications/%s-%s.app/Contents/MacOS/%s",
                         chimera, version, chimeraExe));
+        pathList.add(
+                String.format("%s/Applications/%s-%s.app/Contents/MacOS/%s",
+                        System.getProperty("user.home"), chimera, version,
+                        chimeraExe));
       }
       pathList.add(String.format("/Applications/%s.app/Contents/MacOS/%s",
               chimera, chimeraExe));
+      pathList.add(String.format("%s/Applications/%s.app/Contents/MacOS/%s",
+              System.getProperty("user.home"), chimera, chimeraExe));
     }
     return pathList;
   }