diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-08-16 13:10:11 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-08-16 13:10:11 +0200 |
| commit | 3f3c78534f2a93f08efeaeffe30ac13cabe62e83 (patch) | |
| tree | 36191c39df93aba23667d86cf426771457aa78c2 | |
| parent | 338169f8aaa213b80fc5861aeacdd765cd7d3cf5 (diff) | |
| parent | 5c4cec9b6631e3aec571645b12fcfbfd698c07a4 (diff) | |
| download | mullvadvpn-3f3c78534f2a93f08efeaeffe30ac13cabe62e83.tar.xz mullvadvpn-3f3c78534f2a93f08efeaeffe30ac13cabe62e83.zip | |
Merge branch 'replace-recursive-rmdir'
| -rw-r--r-- | gui/gulpfile.js | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/gulpfile.js b/gui/gulpfile.js index 1b0518ef83..bd8cba71e1 100644 --- a/gui/gulpfile.js +++ b/gui/gulpfile.js @@ -7,7 +7,7 @@ const watch = require('./tasks/watch'); const dist = require('./tasks/distribution'); task('clean', function (done) { - fs.rmdir('./build', { recursive: true }, done); + fs.rm('./build', { recursive: true, force: true }, done); }); task('build-proto', scripts.buildProto); task('build', series('clean', parallel(assets.copyAll, scripts.buildProto), scripts.build)); diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index bedeeb09eb..753af6e53e 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -233,7 +233,7 @@ function packMac() { await notarizeMac(buildResult.artifactPaths[0]); } // remove the folder that contains the unpacked app - return fs.promises.rmdir(appOutDir, { recursive: true }); + return fs.promises.rm(appOutDir, { recursive: true }); }, afterSign: noAppleNotarization ? undefined |