Dont use unreliable inodes for checking file identity (microsoft#25008)

weswigham · web-flow · commit 657d0119cc09 · 2018-06-15T15:53:03.000-07:00
* Dont use unreliable inode as unique identifier

* Just concat with `\n

* Introduce path-overriding code to allow local executables ot be found
diff --git a/Jakefile.js b/Jakefile.js
@@ -10,6 +10,15 @@ const ts = require("./lib/typescript");
 const del = require("del");
 const getDirSize = require("./scripts/build/getDirSize");
 
+// add node_modules to path so we don't need global modules, prefer the modules by adding them first
+var nodeModulesPathPrefix = path.resolve("./node_modules/.bin/") + path.delimiter;
+if (process.env.path !== undefined) {
+    process.env.path = nodeModulesPathPrefix + process.env.path;
+}
+else if (process.env.PATH !== undefined) {
+    process.env.PATH = nodeModulesPathPrefix + process.env.PATH;
+}
+
 const host = process.env.TYPESCRIPT_HOST || process.env.host || "node";
 
 const locales = ["cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-br", "ru", "tr", "zh-cn", "zh-tw"];
diff --git a/scripts/build/getDirSize.js b/scripts/build/getDirSize.js
@@ -4,26 +4,19 @@ const { join } = require("path");
 
 /**
  * Find the size of a directory recursively.
- * Symbolic links are counted once (same inode).
+ * Symbolic links can cause a loop.
  * @param {string} root
- * @param {Set} seen
  * @returns {number} bytes
  */
-function getDirSize(root, seen = new Set()) {
+function getDirSize(root) {
     const stats = lstatSync(root);
 
-    if (seen.has(stats.ino)) {
-        return 0;
-    }
-
-    seen.add(stats.ino);
-
     if (!stats.isDirectory()) {
         return stats.size;
     }
 
     return readdirSync(root)
-        .map(file => getDirSize(join(root, file), seen))
+        .map(file => getDirSize(join(root, file)))
         .reduce((acc, num) => acc + num, 0);
 }
 
diff --git a/scripts/produceLKG.ts b/scripts/produceLKG.ts
@@ -75,7 +75,7 @@ async function writeGitAttributes() {
 
 async function copyWithCopyright(fileName: string) {
     const content = await fs.readFile(path.join(source, fileName), "utf-8");
-    await fs.writeFile(path.join(dest, fileName), copyright + "\r\n" + content);
+    await fs.writeFile(path.join(dest, fileName), copyright + "\n" + content);
 }
 
 async function copyFromBuiltLocal(fileName: string) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ async function writeGitAttributes() {`
`75`	`75`
`76`	`76`	`async function copyWithCopyright(fileName: string) {`
`77`	`77`	`const content = await fs.readFile(path.join(source, fileName), "utf-8");`
`78`		`- await fs.writeFile(path.join(dest, fileName), copyright + "\r\n" + content);`
	`78`	`+ await fs.writeFile(path.join(dest, fileName), copyright + "\n" + content);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`async function copyFromBuiltLocal(fileName: string) {`