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

diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index 1def866..ddc8d84 100644
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -112,7 +112,8 @@ public class PymolManager
       {
         for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
         {
-          for (String binary : new String [] {"PyMOLWinWithConsole.bat", "PyMOLWin.exe"})
+          for (String binary : new String[] { "PyMOLWinWithConsole.bat",
+              "Scripts\\pymol.exe", "PyMOLWin.exe" })
           {
             pathList.add(String.format("%s\\%s\\%s", root, path, binary));
           }
@@ -157,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;
@@ -271,15 +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"))
+        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()));
+        Console.debug("Running PyMOL as " + String.join(" ", pb.command()));
         pymolProcess = pb.start();
         error = "";
         break;