summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-06 16:16:23 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-07 15:11:58 +0200
commit12f1561597a9441178cf52ff8de1d61ecda5024d (patch)
tree3411e08d5ccf817242be9f8c3f7d3083855d0af7 /gui
parenta413e20904b0402b714bcf1c05f7265a0d112898 (diff)
downloadmullvadvpn-12f1561597a9441178cf52ff8de1d61ecda5024d.tar.xz
mullvadvpn-12f1561597a9441178cf52ff8de1d61ecda5024d.zip
Move mullvad CLI binary to directly under install dir
Diffstat (limited to 'gui')
-rwxr-xr-xgui/packages/desktop/electron-builder.yml21
1 files changed, 12 insertions, 9 deletions
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",