diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-04-11 17:02:57 +0800 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-04-12 13:28:30 +0200 |
| commit | 24302c4273bd23e19ce61f8cccd55bb4671485ce (patch) | |
| tree | edb15cc67d0f47ddd124aed111ecb8494f99537d | |
| parent | 7599c0b1009d1c188307f0c170a05fae80ababa7 (diff) | |
| download | mullvadvpn-24302c4273bd23e19ce61f8cccd55bb4671485ce.tar.xz mullvadvpn-24302c4273bd23e19ce61f8cccd55bb4671485ce.zip | |
Can start and connect to the backend
| -rw-r--r-- | app/main.js | 17 | ||||
| -rw-r--r-- | package.json | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/app/main.js b/app/main.js index 9dfc6598b0..d57aea2a1f 100644 --- a/app/main.js +++ b/app/main.js @@ -1,5 +1,6 @@ import path from 'path'; import fs from 'fs'; +import sudo from 'sudo-prompt'; import { app, BrowserWindow, ipcMain, Tray, Menu, nativeImage } from 'electron'; import TrayIconManager from './lib/tray-icon-manager'; @@ -211,3 +212,19 @@ const sendBackendInfo = () => { }); }; +const startBackend = () => { + const pathToBackend = path.resolve(process.env.MULLVAD_BACKEND || '../talpid_core/target/debug/talpid_daemon'); + console.log('Starting the mullvad backend at', pathToBackend); + + const options = { + name: 'mullvad backend', + }; + sudo.exec(pathToBackend, options, (err) => { + if (err) { + console.log('Backend exited with error', err); + } else { + console.log('Backend exited'); + } + }); +}; +if (isDevelopment) startBackend(); diff --git a/package.json b/package.json index 9d6129c755..7729b34a9a 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "npm-run-all": "^4.0.1", "react-addons-test-utils": "^15.4.2", "redux-mock-store": "^1.2.2", - "rimraf": "^2.5.4" + "rimraf": "^2.5.4", + "sudo-prompt": "^7.0.0" }, "scripts": { "postinstall": "install-app-deps", |