import jalview.bin.Cache;
import jalview.gui.Preferences;
+import jalview.util.FileUtils;
import java.io.File;
import java.io.IOException;
}
else if (os.startsWith("Windows"))
{
- for (String root : new String[] { "\\Program Files",
- "C:\\Program Files", "\\Program Files (x86)",
- "C:\\Program Files (x86)" })
- {
- for (String version : new String[] { "1.11", "1.11.1", "1.11.2",
- "1.12", "1.12.1", "1.12.2", "1.13" })
- {
- pathList.add(root + "\\Chimera " + version + "\\bin\\chimera");
- pathList.add(
- root + "\\Chimera " + version + "\\bin\\chimera.exe");
- }
- }
+ /*
+ * typical Windows installation path is
+ * C:\Program Files\Chimera 1.12\bin\chimera.exe
+ */
+ // current drive:
+ pathList.addAll(FileUtils.findMatches("\\",
+ "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
+ // C: drive (note may add as duplicates)
+ pathList.addAll(FileUtils.findMatches("C:\\",
+ "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
}
else if (os.startsWith("Mac"))
{