correctly recognize Mac installations of IDEA 13 and earler as valid …

…SDK homes
ezhaka · Dec 23, 2014 · 40efd80 · 40efd80
1 parent 7235bf3
commit 40efd80
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java
@@ -175,8 +175,14 @@ else if (new File(sdkHome, "license/CLion_Preview_License.txt").exists()) {
   @Nullable
   public static String getBuildNumber(String ideaHome) {
     try {
-      @NonNls final String buildTxt = SystemInfo.isMac ? "/Resources/build.txt" : "/build.txt";
-      return FileUtil.loadFile(new File(ideaHome + buildTxt)).trim();
+      @NonNls final String buildTxt = SystemInfo.isMac ? "Resources/build.txt" : "build.txt";
+      File file = new File(ideaHome, buildTxt);
+      if (SystemInfo.isMac && !file.exists()) {
+        // IntelliJ IDEA 13 and earlier used a different location for build.txt on Mac;
+        // recognize the old location as well
+        file = new File(ideaHome, "build.txt");
+      }
+      return FileUtil.loadFile(file).trim();
     }
     catch (IOException e) {
       return null;