JAL-4020 Added search for PyMOLWinWithConsole.bat (and PyMOLWin.exe) in likely places...

[jalview.git] / src / jalview / ext / pymol / PymolManager.java

diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index 05d5bcc..1acce5e 100644 (file)
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -101,6 +101,18 @@ public class PymolManager
     else if (os.startsWith("Windows"))
     {
       // todo Windows installation path(s)
+       for (String root : new String[]
+      {
+        String.format("%s\\AppData\\Local", System.getProperty("user.home")),
+               "\\Program Files", "C:\\Program Files", "\\Program Files (x86)",
+               "C:\\Program Files (x86)" })
+       {
+         for (String binary : new String [] {"PyMOLWinWithConsole.bat", "PyMOLWin.exe"})
+         {
+          pathList.add(String.format("%s\\Schrodinger\\PyMOL2\\%s", root, binary));
+         }
+       }
+
     }
     else if (os.startsWith("Mac"))
     {