X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fext%2Fpymol%2FPymolManager.java;h=d3b8eceb1a1f3ca7c3e0e2462fb8931a58dfde35;hb=2c1fabdc3d0b711ebcc844c846fefa61d4e58bd8;hp=05d5bcc0befbf51376b9d509fdaf74a350068811;hpb=d654b1f014790b7ae25e6eec631847170a930987;p=jalview.git diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java index 05d5bcc..d3b8ece 100644 --- a/src/jalview/ext/pymol/PymolManager.java +++ b/src/jalview/ext/pymol/PymolManager.java @@ -100,7 +100,22 @@ 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")), // 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)" }) + { + for (String path : new String [] { + "Schrodinger\\PyMOL2", "PyMOL" }) + { + for (String binary : new String [] {"PyMOLWinWithConsole.bat"}) + { + pathList.add(String.format("%s\\%s\\%s", root, path, binary)); + } + } + } } else if (os.startsWith("Mac")) {