Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dont use unreliable inodes for checking file identity #25008

Merged
merged 3 commits into from
Jun 15, 2018
Merged

Dont use unreliable inodes for checking file identity #25008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afffa3f
Dont use unreliable inode as unique identifier
weswigham Jun 15, 2018
a9660bd
Just concat with `\n
weswigham Jun 15, 2018
b51c267
Introduce path-overriding code to allow local executables ot be found
weswigham Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Jakefile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
13 changes: 3 additions & 10 deletions scripts/build/getDirSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A+ would loop again

* @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);
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/produceLKG.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down