diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rwxr-xr-x | gui/packages/desktop/electron-builder.yml | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 72c377ae00..9df285663d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,8 @@ 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 + the app installation directory instead of the `resource` directory. ## [2018.2] - 2018-08-13 diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index 6a5884962d..b67ac0b644 100755 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -40,8 +40,6 @@ mac: extendInfo: LSUIElement: true extraResources: - - from: ../../../target/release/mullvad - to: . - from: ../../../target/release/problem-report to: . - from: ../../../target/release/mullvad-daemon @@ -52,6 +50,9 @@ mac: to: . - from: ../../../dist-assets/uninstall_macos.sh to: ./uninstall.sh + extraFiles: + - from: ../../../target/release/mullvad + to: . pkg: allowAnywhere: false @@ -72,10 +73,11 @@ win: arch: - x64 artifactName: MullvadVPN-${version}.${ext} + publisherName: Amagicom AB + signingHashAlgorithms: + - sha256 signDlls: true extraResources: - - from: ../../../target/release/mullvad.exe - to: . - from: ../../../target/release/problem-report.exe to: . - from: ../../../target/release/mullvad-daemon.exe @@ -90,9 +92,9 @@ win: to: . - from: ../../../dist-assets/binaries/windows/openvpn.exe to: . - publisherName: Amagicom AB - signingHashAlgorithms: - - sha256 + extraFiles: + - from: ../../../target/release/mullvad.exe + to: . linux: target: @@ -101,8 +103,6 @@ linux: artifactName: MullvadVPN-${version}_${arch}.${ext} category: Network extraResources: - - from: ../../../target/release/mullvad - to: . - from: ../../../target/release/problem-report to: . - from: ../../../target/release/mullvad-daemon @@ -115,6 +115,9 @@ linux: to: . - from: ../../../dist-assets/linux/mullvad-daemon.service to: . + extraFiles: + - from: ../../../target/release/mullvad + to: . deb: fpm: ["--before-install", "../../../dist-assets/linux/before-install.sh", |