From 57ccaa27f978ef143be6f37eaced24658e9d9f57 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 15 Jul 2016 18:29:44 -0400 Subject: [PATCH] Return an OS path for .meteor/local/dev_bundle. --- tools/cli/dev-bundle-links.js | 3 ++- tools/project-context.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/cli/dev-bundle-links.js b/tools/cli/dev-bundle-links.js index bb157dce56..d203fc973a 100644 --- a/tools/cli/dev-bundle-links.js +++ b/tools/cli/dev-bundle-links.js @@ -22,6 +22,7 @@ exports.makeLink = function (target, linkPath) { } }; +// Note: this function returns an OS-specific path! exports.readLink = function (linkPath) { linkPath = files.convertToOSPath(linkPath); @@ -32,5 +33,5 @@ exports.readLink = function (linkPath) { linkPath = fs.readFileSync(linkPath, "utf8"); } - return files.convertToStandardPath(linkPath); + return linkPath; }; diff --git a/tools/project-context.js b/tools/project-context.js index da6af053f5..d1d7b01d45 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -1427,7 +1427,9 @@ _.extend(exports.ReleaseFile.prototype, { const newTarget = this.getDevBundle(); try { - if (newTarget === readLink(devBundleLink)) { + const oldOSPath = readLink(devBundleLink); + const oldTarget = files.convertToStandardPath(oldOSPath); + if (newTarget === oldTarget) { // Don't touch .meteor/local/dev_bundle if it already points to // the right target path. return;