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

Fix rimraf bin resolution #566

Merged
merged 2 commits into from
Feb 2, 2017
Merged

Fix rimraf bin resolution #566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76b530e
Fix rimraf bin resolution
rtsao Feb 1, 2017
a00c525
Add comment regarding rimraf executable path
rtsao Feb 1, 2017
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
8 changes: 3 additions & 5 deletions src/FileSystemUtilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import mkdirp from "mkdirp";
import fs from "fs";
import cmdShim from "cmd-shim";
import readCmdShim from "read-cmd-shim";
import { resolve, dirname, relative, join } from "path";
import { resolve, dirname, relative } from "path";
import ChildProcessUtilities from "./ChildProcessUtilities";

const ENDS_WITH_NEW_LINE = /\n$/;
Expand Down Expand Up @@ -51,10 +51,8 @@ export default class FileSystemUtilities {

@logger.logifyAsync()
static rimraf(filePath, callback) {
ChildProcessUtilities.exec("npm bin", {cwd: __dirname}, (err, npmBinPath) => {
if (err) return callback(err);
ChildProcessUtilities.spawn(join(npmBinPath.trim(), "rimraf"), [filePath], {}, callback);
});
// Note: if rimraf moves the location of its executable, this will need to be updated
ChildProcessUtilities.spawn(require.resolve("rimraf/bin"), [filePath], {}, callback);
}

@logger.logifyAsync()
Expand Down