Improve .meteor/dev_bundle link reading and creation.

Ben Newman · Ben Newman · commit f8b1bba60667 · 2016-07-10T15:39:46.000-04:00
diff --git a/tools/cli/dev-bundle-links.js b/tools/cli/dev-bundle-links.js
@@ -1,6 +1,10 @@
 var fs = require("fs");
+var files = require("../fs/mini-files.js");
 
 exports.makeLink = function (target, linkPath) {
+  target = files.convertToOSPath(target);
+  linkPath = files.convertToOSPath(linkPath);
+
   var tempPath = linkPath + "-" + Math.random().toString(36).slice(2);
 
   try {
@@ -13,15 +17,14 @@ exports.makeLink = function (target, linkPath) {
 };
 
 exports.readLink = function (linkPath) {
-  var stat = fs.lstatSync(linkPath);
+  linkPath = files.convertToOSPath(linkPath);
 
+  var stat = fs.lstatSync(linkPath);
   if (stat.isSymbolicLink()) {
-    return fs.realpathSync(linkPath);
-  }
-
-  if (stat.isFile()) {
-    return fs.readFileSync(linkPath, "utf8");
+    linkPath = fs.realpathSync(linkPath);
+  } else if (stat.isFile()) {
+    linkPath = fs.readFileSync(linkPath, "utf8");
   }
 
-  return linkPath;
+  return files.convertToStandardPath(linkPath);
 };
diff --git a/tools/project-context.js b/tools/project-context.js
@@ -1348,6 +1348,8 @@ _.extend(exports.ReleaseFile.prototype, {
   },
 
   ensureDevBundleLink() {
+    import { makeLink, readLink } from "./cli/dev-bundle-links.js";
+
     // Make a symlink from .meteor/dev_bundle to the actual dev_bundle.
     const devBundleLink = files.pathJoin(
       files.pathDirname(this.filename),
@@ -1369,15 +1371,12 @@ _.extend(exports.ReleaseFile.prototype, {
     const newTarget = files.realpath(files.getDevBundle());
 
     try {
-      if (newTarget === files.realpath(devBundleLink)) {
+      if (newTarget === readLink(devBundleLink)) {
         // Don't touch .meteor/dev_bundle if it already points to the
         // right target path.
         return;
       }
 
-      // Remove .meteor/dev_bundle so that we can recreate it below.
-      files.rm_recursive(devBundleLink);
-
     } catch (e) {
       if (e.code !== "ENOENT") {
         // It's ok if files.realpath(devBundleLink) failed because the
@@ -1386,10 +1385,7 @@ _.extend(exports.ReleaseFile.prototype, {
       }
     }
 
-    require("./cli/dev-bundle-links.js").makeLink(
-      files.convertToOSPath(newTarget),
-      files.convertToOSPath(devBundleLink)
-    );
+    makeLink(newTarget, devBundleLink);
   },
 
   write: function (releaseName) {
