+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.pymol;
import java.io.BufferedReader;
protected static List<String> getPymolPaths(String os)
{
List<String> pathList = new ArrayList<>();
-
- String userPath = Cache
- .getDefault(Preferences.PYMOL_PATH, null);
+
+ String userPath = Cache.getDefault(Preferences.PYMOL_PATH, null);
if (userPath != null)
{
pathList.add(userPath);
}
-
+
/*
* add default installation paths
*/
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"))
{
Console.error("Failed to start PyMOL with XMLRPC, response was: "
+ responses);
}
- Console.error("PyMOL started with XMLRPC on port " + port);
+ Console.info("PyMOL started with XMLRPC on port " + port);
return port;
}