diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-12 11:55:10 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-12 11:55:10 +0200 |
| commit | 4cea1a683f2abfb4ee6b0549bdcf9db2517bb400 (patch) | |
| tree | a9600026b3ace68800c81bf3c01c6bc385106605 | |
| parent | 2b4bc938b39a1b84dc4a0584712f5185365da539 (diff) | |
| parent | 1c9249419c68b2d89d888f8283b44c30e5392e93 (diff) | |
| download | mullvadvpn-4cea1a683f2abfb4ee6b0549bdcf9db2517bb400.tar.xz mullvadvpn-4cea1a683f2abfb4ee6b0549bdcf9db2517bb400.zip | |
Merge branch 'move-cli-binary-back-windows'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rwxr-xr-x | gui/packages/desktop/electron-builder.yml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a8aac5a9fe..2d05612d56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,7 @@ Line wrap the file at 100 chars. Th - Replace WebSockets with Unix domain sockets/Named pipes for IPC. The location of the socket can be controlled with `MULLVAD_RPC_SOCKET_PATH`. - Update the relay list if it's out of date when the daemon starts. -- Move the CLI binary (`mullvad` or `mullvad.exe`) up one level, so it's installed directly into +- Move the CLI binary (`mullvad`) on macOS and Linux up one level, so it's installed directly into the app installation directory instead of the `resource` directory. diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index b67ac0b644..cf164140f7 100755 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -92,7 +92,6 @@ win: to: . - from: ../../../dist-assets/binaries/windows/openvpn.exe to: . - extraFiles: - from: ../../../target/release/mullvad.exe to: . |