summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-05-14 16:46:08 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-05-21 13:22:34 +0200
commit1f00b320d10e8c486aa9766035fdf6443c0fa406 (patch)
tree988d58f553b847480015866fa16a5823a78623fb
parent141315df41dd55fd85c13c09c2145c7cd35b428e (diff)
downloadmullvadvpn-1f00b320d10e8c486aa9766035fdf6443c0fa406.tar.xz
mullvadvpn-1f00b320d10e8c486aa9766035fdf6443c0fa406.zip
Update README regarding GUI starting backend
-rw-r--r--README.md10
-rw-r--r--app/lib/proc.js3
2 files changed, 6 insertions, 7 deletions
diff --git a/README.md b/README.md
index 18aeaa726e..e31163948c 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,12 @@ The specific build tool version that is required is `v141`.
If you change any javascript file while the development mode is running it will automatically
transpile and reload the file so that the changes are visible almost immediately.
-The app will attempt to start the daemon automatically. The exact binary being run can be
-customized with the `MULLVAD_BACKEND` environment variable.
+Please note that the GUI needs a running daemon to connect to in order to work. See
+[Building and running mullvad-daemon](#building-and-running-mullvad-daemon) for instruction on how
+to do that before starting the GUI.
-If the `/tmp/.mullvad_rpc_address` file exists the app will not start the daemon, so if you want
-to run a specific version of the daemon you can just start it yourself and the app will pick up on
-it and behave accordingly.
+The GUI will need to resolve the path to binaries. In development mode this defaults to
+`./target/debug/`, but can be configured with the `MULLVAD_PATH` environment variable.
## Packaging the app
diff --git a/app/lib/proc.js b/app/lib/proc.js
index f7603bbdff..d0cd46f886 100644
--- a/app/lib/proc.js
+++ b/app/lib/proc.js
@@ -9,8 +9,7 @@ export function resolveBin(binaryName: string) {
function getBasePath() {
if (process.env.NODE_ENV === 'development') {
- return process.env.MULLVAD_BACKEND || './target/debug';
-
+ return process.env.MULLVAD_PATH || './target/debug';
} else {
return process.resourcesPath;
}