diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-14 13:40:57 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-14 14:17:37 +0200 |
| commit | 8590367e3733a440fb3a5f5408cf703a26483e18 (patch) | |
| tree | 7e1166f6aa984b5272a96e2c46a2bf3163088d72 | |
| parent | c89f9a663e36d13614832126d4ca61f36362ca35 (diff) | |
| download | mullvadvpn-8590367e3733a440fb3a5f5408cf703a26483e18.tar.xz mullvadvpn-8590367e3733a440fb3a5f5408cf703a26483e18.zip | |
Move CLI binary back to resource dir on macOS
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rwxr-xr-x | gui/packages/desktop/electron-builder.yml | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dcd73bef0..6064bef486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +### Changed +#### macOS +- Move the CLI binary (`mullvad`) back into the `Resources/` directory. A bug caused the app to not + be signed if it was placed in the app root directory. ## [2018.3-beta1] - 2018-09-13 diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index 602c58d404..c869de2317 100755 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -40,6 +40,8 @@ mac: extendInfo: LSUIElement: true extraResources: + - from: ../../../target/release/mullvad + to: . - from: ../../../target/release/problem-report to: . - from: ../../../target/release/mullvad-daemon @@ -50,9 +52,6 @@ mac: to: . - from: ../../../dist-assets/uninstall_macos.sh to: ./uninstall.sh - extraFiles: - - from: ../../../target/release/mullvad - to: . pkg: allowAnywhere: false @@ -78,6 +77,8 @@ win: - sha256 signDlls: true extraResources: + - from: ../../../target/release/mullvad.exe + to: . - from: ../../../target/release/problem-report.exe to: . - from: ../../../target/release/mullvad-daemon.exe @@ -92,8 +93,6 @@ win: to: . - from: ../../../dist-assets/binaries/windows/openvpn.exe to: . - - from: ../../../target/release/mullvad.exe - to: . linux: target: @@ -101,6 +100,9 @@ linux: - rpm artifactName: MullvadVPN-${version}_${arch}.${ext} category: Network + extraFiles: + - from: ../../../target/release/mullvad + to: . extraResources: - from: ../../../target/release/problem-report to: . @@ -114,9 +116,6 @@ 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", |