diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-09-04 06:49:38 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-09-04 06:49:38 -0300 |
| commit | 1d5be836d3aea89ce3e75eabcae8a3e7d5df1c83 (patch) | |
| tree | 696fce11808892a6daf68d136566e312a10fc8b9 /gui | |
| parent | 5946412a0538679d20500cc4b2aedc4de6fea817 (diff) | |
| parent | 4837004e7e8d1d67c87c7cb15bc14e62b8a3f353 (diff) | |
| download | mullvadvpn-1d5be836d3aea89ce3e75eabcae8a3e7d5df1c83.tar.xz mullvadvpn-1d5be836d3aea89ce3e75eabcae8a3e7d5df1c83.zip | |
Merge branch 'fix-install-on-ubuntu-1404'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/packages/desktop/electron-builder.yml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index 144144cca9..e94bdb0d13 100644 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -109,18 +109,26 @@ linux: to: . - from: ../../../dist-assets/binaries/linux/openvpn to: . + - from: ../../../dist-assets/linux/mullvad-daemon.conf + to: . + - from: ../../../dist-assets/linux/mullvad-daemon.service + to: . deb: - fpm: ["--config-files", "/etc/systemd/system/mullvad-daemon.service", - "../../../dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/"] - afterInstall: ../../../dist-assets/linux/install_script.sh - afterRemove: ../../../dist-assets/linux/uninstall_script.sh + fpm: ["--before-install", "../../../dist-assets/linux/before-install.sh", + "--before-remove", "../../../dist-assets/linux/before-remove.sh", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.service", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf"] + afterInstall: ../../../dist-assets/linux/after-install.sh + afterRemove: ../../../dist-assets/linux/after-remove.sh rpm: - fpm: ["--config-files", "/etc/systemd/system/mullvad-daemon.service", - "../../../dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/"] - afterInstall: ../../../dist-assets/linux/install_script.sh - afterRemove: ../../../dist-assets/linux/uninstall_script.sh + fpm: ["--before-install", "../../../dist-assets/linux/before-install.sh", + "--before-remove", "../../../dist-assets/linux/before-remove.sh", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.service", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf"] + afterInstall: ../../../dist-assets/linux/after-install.sh + afterRemove: ../../../dist-assets/linux/after-remove.sh depends: - libXScrnSaver - libappindicator |