X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fpymol%2FPymolManager.java;h=ddc8d84e859cc46bcff1613b3117df1cfed0b4b2;hb=8a2a0cda7067530f8481c2aec203e18d555f2dfd;hp=1acce5e3ae789f863672604e2a54d419a1c86a70;hpb=483ecb5e4541537778844529cc93204f9124b68d;p=jalview.git

diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index 1acce5e..ddc8d84 100644
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -32,12 +32,13 @@ import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.gui.Preferences;
-import jalview.structure.StructureCommand;
 import jalview.structure.StructureCommandI;
+import jalview.util.Platform;
 
 public class PymolManager
 {
@@ -100,19 +101,24 @@ public class PymolManager
     }
     else if (os.startsWith("Windows"))
     {
-      // todo Windows installation path(s)
-    	for (String root : new String[]
+      for (String root : new String[] {
+          String.format("%s\\AppData\\Local",
+                  System.getProperty("user.home")), // default user path
+          "\\ProgramData", "C:\\ProgramData", // this is the default install
+                                              // path "for everyone"
+          System.getProperty("user.home"), "\\Program Files",
+          "C:\\Program Files", "\\Program Files (x86)",
+          "C:\\Program Files (x86)" })
       {
-        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));
-    	  }
-    	}
-
+        for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
+        {
+          for (String binary : new String[] { "PyMOLWinWithConsole.bat",
+              "Scripts\\pymol.exe", "PyMOLWin.exe" })
+          {
+            pathList.add(String.format("%s\\%s\\%s", root, path, binary));
+          }
+        }
+      }
     }
     else if (os.startsWith("Mac"))
     {
@@ -152,7 +158,7 @@ public class PymolManager
           boolean getReply)
   {
     String postBody = getPostRequest(command);
-    // System.out.println(postBody);// debug
+    // jalview.bin.Console.outPrintln(postBody);// debug
     String rpcUrl = "http://127.0.0.1:" + this.pymolXmlRpcPort;
     PrintWriter out = null;
     BufferedReader in = null;
@@ -266,8 +272,16 @@ public class PymolManager
         }
         List<String> args = new ArrayList<>();
         args.add(pymolPath);
+
+        // Windows PyMOLWin.exe needs an extra argument
+        if (Platform.isWin() && pymolPath.toLowerCase(Locale.ROOT)
+                .endsWith("\\pymolwin.exe"))
+        {
+          args.add("+2");
+        }
         args.add("-R"); // https://pymolwiki.org/index.php/RPC
         ProcessBuilder pb = new ProcessBuilder(args);
+        Console.debug("Running PyMOL as " + String.join(" ", pb.command()));
         pymolProcess = pb.start();
         error = "";
         break;