diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-10-10 22:21:33 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-10-10 22:21:33 +0100 |
| commit | 7442a8f964fa61eb01e0a82fc76476f781c58cdb (patch) | |
| tree | bd07d2e8d5aa27d2a2cee44afd65e974755c3f86 | |
| parent | f22de657e9c1415bca1a7afd0a2ab04f4cdbda84 (diff) | |
| parent | e58042532e596ca1e9957bc3291797f8bf63abf7 (diff) | |
| download | mullvadvpn-7442a8f964fa61eb01e0a82fc76476f781c58cdb.tar.xz mullvadvpn-7442a8f964fa61eb01e0a82fc76476f781c58cdb.zip | |
Merge branch 'add-symbolic-link-to-fpm'
| -rw-r--r-- | dist-assets/linux/after-install.sh | 2 | ||||
| -rw-r--r-- | dist-assets/linux/before-remove.sh | 2 | ||||
| l--------- | dist-assets/linux/problem-report-link | 1 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/dist-assets/linux/after-install.sh b/dist-assets/linux/after-install.sh index 29b425d370..0abe49cbe5 100644 --- a/dist-assets/linux/after-install.sh +++ b/dist-assets/linux/after-install.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash set -eu -ln -sf "/opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report - if which systemctl &> /dev/null; then systemctl enable "/opt/Mullvad VPN/resources/mullvad-daemon.service" systemctl start mullvad-daemon.service diff --git a/dist-assets/linux/before-remove.sh b/dist-assets/linux/before-remove.sh index bd540072eb..2cb0c9afcd 100644 --- a/dist-assets/linux/before-remove.sh +++ b/dist-assets/linux/before-remove.sh @@ -9,8 +9,6 @@ if [[ "$1" =~ $is_number_re ]] && [ $1 -gt 0 ]; then exit 0; fi -rm -f /usr/bin/mullvad-problem-report - if which systemctl &> /dev/null; then # the user might've disabled or stopped the service themselves already systemctl stop mullvad-daemon.service || true diff --git a/dist-assets/linux/problem-report-link b/dist-assets/linux/problem-report-link new file mode 120000 index 0000000000..8804766319 --- /dev/null +++ b/dist-assets/linux/problem-report-link @@ -0,0 +1 @@ +/opt/Mullvad VPN/resources/mullvad-problem-report
\ No newline at end of file diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 775dbd526d..be262cf80e 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -123,6 +123,7 @@ const config = { '--config-files', '/opt/Mullvad VPN/resources/mullvad-daemon.conf', distAssets('mullvad') + '=/usr/bin/', + distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report', ], afterInstall: distAssets('linux/after-install.sh'), afterRemove: distAssets('linux/after-remove.sh'), @@ -142,6 +143,7 @@ const config = { '--config-files', '/opt/Mullvad VPN/resources/mullvad-daemon.conf', distAssets('mullvad') + '=/usr/bin/', + distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report', ], afterInstall: distAssets('linux/after-install.sh'), afterRemove: distAssets('linux/after-remove.sh'), |