maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6578 from bevacqua/hotfix/build

Browse source 
Fix a bug where removing a directory failed under Linux systems
This commit is contained in:
Court Ewing 2016-03-18 13:04:02 -04:00
parent 6c65b37f9e 849a499771
commit 9c9b962930
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tasks/build/os_shell_scripts.js
View file

@ -1,9 +1,9 @@
import {unlink} from 'fs';
import {join, extname} from 'path';
import {promisify} from 'bluebird';
import {ncp} from 'ncp';
import rimraf from 'rimraf';
const pncp = promisify(ncp);
const punlink = promisify(unlink);
const primraf = promisify(rimraf);
export default function (grunt) {
grunt.registerTask('_build:osShellScripts', async function osShellScripts() {
@ -13,7 +13,7 @@ export default function (grunt) {
const allPlatforms = fn => invokeAllAsync(platforms, fn);
try {
await allPlatforms(platform => punlink(join(platform.buildDir, 'bin')));
await allPlatforms(platform => primraf(join(platform.buildDir, 'bin')));
await allPlatforms(platform => pncp(source, join(platform.buildDir, 'bin')));
await allPlatforms(platform => removeExtraneousShellScripts(grunt, platform));
done();
@ -31,7 +31,7 @@ function removeExtraneousShellScripts(grunt, platform) {
return Promise.all(grunt.file
.expand(join(platform.buildDir, 'bin', '*'))
.filter(file => isExtraneous(platform, file))
.map(file => punlink(file)));
.map(file => primraf(file)));
}
function isExtraneous(platform, file) {