Merge pull request meteor#8500 from abernix/abernix/wsl-fs-fix

abernix · web-flow · commit 33567f8d9a9d · 2017-03-22T20:16:51.000+02:00
Be more understanding of Windows' filesystem limitations.
diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,8 @@
 checkout:
   post:
-    - git submodule update --init
+    # https://discuss.circleci.com/t/git-submodule-url-isnt-playing-nice-with-the-cache/549/3
+    - git submodule sync
+    - git submodule update --init --recursive || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init --recursive)
 
 dependencies:
   pre:
diff --git a/packages/non-core/blaze b/packages/non-core/blaze
@@ -1 +1 @@
-Subproject commit de534b1a95d2218f0b47398d235810b38b954141
+Subproject commit e9a03af5edc69777058f87f521d98b6faba9910c
diff --git a/tools/fs/files.js b/tools/fs/files.js
@@ -1664,7 +1664,7 @@ files.existsSync = function (path, callback) {
   return !! files.statOrNull(path);
 };
 
-if (process.platform === "win32") {
+if (files.isWindowsLikeFilesystem()) {
   var rename = files.rename;
 
   files.rename = function (from, to) {
@@ -1677,7 +1677,7 @@ if (process.platform === "win32") {
         rename(from, to);
         success = true;
       } catch (err) {
-        if (err.code !== 'EPERM') {
+        if (err.code !== 'EPERM' && err.code !== 'EACCES') {
           throw err;
         }
       }
diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js
@@ -13,6 +13,14 @@ var assert = require("assert");
 // after bootup (since they block all concurrency!)
 var files = module.exports;
 
+// Detect that we are on a Windows-like Filesystem, such as that in a WSL
+// (Windows Subsystem for Linux) even if it otherwise looks like we're on Unix.
+// https://github.com/Microsoft/BashOnWindows/issues/423#issuecomment-221627364
+var isWindowsLikeFilesystem = function () {
+  return process.platform === "win32" ||
+    (os.release().indexOf("Microsoft") > -1);
+};
+
 var toPosixPath = function (p, partialPath) {
   // Sometimes, you can have a path like \Users\IEUser on windows, and this
   // actually means you want C:\Users\IEUser
@@ -115,6 +123,8 @@ files.pathSep = '/';
 files.pathDelimiter = ':';
 files.pathOsDelimiter = path.delimiter;
 
+files.isWindowsLikeFilesystem = isWindowsLikeFilesystem;
+
 files.convertToStandardPath = convertToStandardPath;
 files.convertToOSPath = convertToOSPath;
 files.convertToWindowsPath = toDosPath;
