Merge branch 'dont-start-the-backend'

3 files changed, 3 insertions, 43 deletions

diff --git a/app/main.js b/app/main.js
index ca7ecf7c5d..980a678469 100644
--- a/app/main.js
+++ b/app/main.js
@@ -29,10 +29,6 @@ const appDelegate = {
       log.transports.file.level = 'info';
     }
 
-    if (isDevelopment) {
-      appDelegate._startBackend();
-    }
-
     app.on('window-all-closed', () => appDelegate.onAllWindowsClosed());
     app.on('ready', () => appDelegate.onReady());
   },
@@ -62,24 +58,6 @@ const appDelegate = {
     app.quit();
   },
 
-  _startBackend: () => {
-    const sudo = require('sudo-prompt');
-    const pathToBackend = path.resolve(process.env.MULLVAD_BACKEND || '../talpid_core/target/debug/talpid_daemon');
-    log.info('Starting the mullvad backend at', pathToBackend);
-
-    const options = {
-      name: 'mullvad backend',
-    };
-
-    sudo.exec(pathToBackend, options, (err) => {
-      if (err && err.signal !== 'SIGINT') {
-        log.info('Backend exited with error', err);
-      } else {
-        log.info('Backend exited');
-      }
-    });
-  },
-
   _sendBackendInfo: (window: BrowserWindow) => {
     const file = './.mullvad_rpc_address';
     log.info('reading the ipc connection info from', file);
diff --git a/package.json b/package.json
index 9a35fd51a5..3cc302efb0 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,7 @@
     "mocha": "^3.2.0",
     "npm-run-all": "^4.0.1",
     "redux-mock-store": "^1.2.2",
-    "rimraf": "^2.5.4",
-    "sudo-prompt": "^7.0.0"
+    "rimraf": "^2.5.4"
   },
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
diff --git a/yarn.lock b/yarn.lock
index 7126891842..41fc24df5d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2991,11 +2991,7 @@ home-path@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.5.tgz#788b29815b12d53bacf575648476e6f9041d133f"
 
-hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
-
-hosted-git-info@^2.5.0:
+hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
@@ -4002,16 +3998,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5332,10 +5319,6 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-sudo-prompt@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-7.0.0.tgz#da415b73e05e2a07fbfe540401bffc790c4f7dd9"
-
 sumchecker@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"