diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-05-22 08:57:27 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-05-22 09:03:45 +0200 |
| commit | 26b3e3473220984254afcac36f1c1916f33679e9 (patch) | |
| tree | 6ffe6f60c6c7637bfeb1286c1dcbe1cca61bb2ad | |
| parent | 022b3e0e52d2ca1992debbb0b428ba0ab80523fe (diff) | |
| download | mullvadvpn-26b3e3473220984254afcac36f1c1916f33679e9.tar.xz mullvadvpn-26b3e3473220984254afcac36f1c1916f33679e9.zip | |
Move linux scripts into dist-assets
| -rw-r--r-- | dist-assets/linux/install_script.sh (renamed from linux/install_script.sh) | 0 | ||||
| -rw-r--r-- | dist-assets/linux/mullvad-daemon.service (renamed from linux/mullvad-daemon.service) | 0 | ||||
| -rw-r--r-- | dist-assets/linux/uninstall_script.sh (renamed from linux/uninstall_script.sh) | 0 | ||||
| -rw-r--r-- | electron-builder.yml | 13 |
4 files changed, 7 insertions, 6 deletions
diff --git a/linux/install_script.sh b/dist-assets/linux/install_script.sh index ea03f94c91..ea03f94c91 100644 --- a/linux/install_script.sh +++ b/dist-assets/linux/install_script.sh diff --git a/linux/mullvad-daemon.service b/dist-assets/linux/mullvad-daemon.service index 83c3032031..83c3032031 100644 --- a/linux/mullvad-daemon.service +++ b/dist-assets/linux/mullvad-daemon.service diff --git a/linux/uninstall_script.sh b/dist-assets/linux/uninstall_script.sh index b4f4671b92..b4f4671b92 100644 --- a/linux/uninstall_script.sh +++ b/dist-assets/linux/uninstall_script.sh diff --git a/electron-builder.yml b/electron-builder.yml index e16375dd3a..1e9eec65ef 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -68,6 +68,7 @@ linux: - deb - rpm artifactName: MullvadVPN-${version}_${arch}.${ext} + category: Network extraResources: - from: ./target/release/mullvad to: . @@ -80,12 +81,12 @@ linux: deb: fpm: ["--config-files", "/etc/systemd/system/mullvad-daemon.service", - "./linux/mullvad-daemon.service=/etc/systemd/system/"] - afterInstall: linux/install_script.sh - afterRemove: linux/uninstall_script.sh + "./dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/"] + afterInstall: ./dist-assets/linux/install_script.sh + afterRemove: ./dist-assets/linux/uninstall_script.sh rpm: fpm: ["--config-files", "/etc/systemd/system/mullvad-daemon.service", - "./linux/mullvad-daemon.service=/etc/systemd/system/"] - afterInstall: linux/install_script.sh - afterRemove: linux/uninstall_script.sh + "./dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/"] + afterInstall: ./dist-assets/linux/install_script.sh + afterRemove: ./dist-assets/linux/uninstall_script.sh |