Merge branch 'fix-linux-bulid-rename-race-condition'

3 files changed, 8 insertions, 22 deletions

diff --git a/gui/gulpfile.js b/gui/gulpfile.js
index 6a7226c1aa..1b0518ef83 100644
--- a/gui/gulpfile.js
+++ b/gui/gulpfile.js
@@ -1,5 +1,5 @@
+const fs = require('fs');
 const { task, series, parallel } = require('gulp');
-const rimraf = require('rimraf');
 
 const scripts = require('./tasks/scripts');
 const assets = require('./tasks/assets');
@@ -7,7 +7,7 @@ const watch = require('./tasks/watch');
 const dist = require('./tasks/distribution');
 
 task('clean', function (done) {
-  rimraf('./build', done);
+  fs.rmdir('./build', { recursive: true }, done);
 });
 task('build-proto', scripts.buildProto);
 task('build', series('clean', parallel(assets.copyAll, scripts.buildProto), scripts.build));
diff --git a/gui/package.json b/gui/package.json
index 0b909c1026..408fa4001c 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -88,7 +88,6 @@
     "gulp-sourcemaps": "^3.0.0",
     "gulp-typescript": "^5.0.1",
     "prettier": "^2.2.1",
-    "rimraf": "^2.7.1",
     "semver": "^7.3.2",
     "sinon": "^7.1.1",
     "spa-server": "^1.0.0",
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index 23a5582d9d..d6e6481871 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -1,16 +1,10 @@
 const path = require('path');
 const fs = require('fs');
 const builder = require('electron-builder');
-const rimraf = require('rimraf');
 const parseSemver = require('semver/functions/parse');
-const util = require('util');
 const { notarize } = require('electron-notarize');
 const { version } = require('../package.json');
 
-const renameAsync = util.promisify(fs.rename);
-const unlinkAsync = util.promisify(fs.unlink);
-const rimrafAsync = util.promisify(rimraf);
-
 const compression = process.argv.indexOf('--no-compression') !== -1 ? 'store' : 'normal';
 const noAppleNotarization = process.argv.indexOf('--no-apple-notarization') !== -1;
 
@@ -207,7 +201,7 @@ function packMac() {
           await notarizeMac(buildResult.artifactPaths[0]);
         }
         // remove the folder that contains the unpacked app
-        return rimrafAsync(appOutDir);
+        return fs.promises.rmdir(appOutDir, { recursive: true });
       },
       afterSign: noAppleNotarization
         ? undefined
@@ -235,22 +229,15 @@ function packLinux() {
     targets: builder.Platform.LINUX.createTarget(),
     config: {
       ...config,
-      afterPack: (context) => {
+      afterPack: async (context) => {
         const sourceExecutable = path.join(context.appOutDir, 'mullvad-vpn');
         const targetExecutable = path.join(context.appOutDir, 'mullvad-gui');
         const launcherScript = path.join(context.appOutDir, 'mullvad-gui-launcher.sh');
-        const chromeSandbox = path.join(context.appOutDir, 'chrome-sandbox');
-
-        return Promise.all([
-          // rename mullvad-vpn to mullvad-gui
-          renameAsync(sourceExecutable, targetExecutable),
-
-          // rename launcher script to mullvad-vpn
-          renameAsync(launcherScript, sourceExecutable),
 
-          // remove the chrome-sandbox file since we explicitly disable it
-          unlinkAsync(chromeSandbox),
-        ]);
+        // rename mullvad-vpn to mullvad-gui
+        await fs.promises.rename(sourceExecutable, targetExecutable);
+        // rename launcher script to mullvad-vpn
+        await fs.promises.rename(launcherScript, sourceExecutable);
       },
     },
   });