diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-10-03 11:11:27 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-10-05 13:49:13 +0100 |
| commit | 60896953b92cd75ce7bc18e660dba87d979dd5a0 (patch) | |
| tree | 8900f1819224f5b317dd08ba5cce056d14bd131b | |
| parent | c83a5d0826c581887b61cc8f997a1f73355bebe3 (diff) | |
| download | mullvadvpn-60896953b92cd75ce7bc18e660dba87d979dd5a0.tar.xz mullvadvpn-60896953b92cd75ce7bc18e660dba87d979dd5a0.zip | |
Put mullvad binary in /usr/bin
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rwxr-xr-x | gui/packages/desktop/electron-builder.yml | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b768383fbf..7037ffebab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,9 @@ Line wrap the file at 100 chars. Th ### Changed - Auto-hide scrollbars on macOS only, leaving them visible on other platforms. +#### Linux +- Moved CLI binary to `/usr/bin/` as to have the CLI binary in the user's `$PATH` by default. + ### Fixed #### Windows - Use different method for identifying network interfaces during installation. diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index 4d99c45e93..3aae55b9aa 100755 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -100,9 +100,6 @@ linux: - rpm artifactName: MullvadVPN-${version}_${arch}.${ext} category: Network - extraFiles: - - from: ../../../target/release/mullvad - to: . extraResources: - from: ../../../target/release/problem-report to: . @@ -121,7 +118,9 @@ deb: 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"] + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf", + "../../../target/release/mullvad=/usr/bin/", + ] afterInstall: ../../../dist-assets/linux/after-install.sh afterRemove: ../../../dist-assets/linux/after-remove.sh @@ -129,7 +128,9 @@ rpm: 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"] + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf", + "../../../target/release/mullvad=/usr/bin/", + ] afterInstall: ../../../dist-assets/linux/after-install.sh afterRemove: ../../../dist-assets/linux/after-remove.sh depends: |