diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-09-05 13:38:20 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-09-05 13:38:20 +0200 |
| commit | 993fb10670e1112234739a70d88a48dcdc257527 (patch) | |
| tree | 81d83adce0a7a6cdf9660433565404b119f21d18 | |
| parent | 8e059820b6ac96fa8ad4e269532ab5d077028b0f (diff) | |
| parent | ec8b83e646e72c9cf4b6454e288bf59665c0e85b (diff) | |
| download | mullvadvpn-993fb10670e1112234739a70d88a48dcdc257527.tar.xz mullvadvpn-993fb10670e1112234739a70d88a48dcdc257527.zip | |
Merge branch 'linux-BE-binary'
| -rw-r--r-- | app/main.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/main.js b/app/main.js index 502bb439aa..f812127172 100644 --- a/app/main.js +++ b/app/main.js @@ -114,13 +114,9 @@ const appDelegate = { if (isDevelopment) { return path.resolve(process.env.MULLVAD_BACKEND || '../talpid_core/target/debug/mullvadd'); - } else if (isMacOS) { + } else if (isMacOS || isLinux) { return path.join(process.resourcesPath, 'mullvadd'); - } else if (isLinux) { - // TODO: Decide - return ''; - } else if (isWindows) { // TODO: Decide return ''; |