summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD2
-rw-r--r--mullvad-vpn-cli.install6
3 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index bd2416a1e95e..f96ffbbce799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mullvadvpn-app-binaries/
mullvadvpn-app/
pkg/
src/
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 744920acc8f7..42799729794e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,7 +73,7 @@ package() {
install --verbose -D --mode=755 target/release/mullvad -t "${pkgdir}/usr/bin"
# Install settings.json
- install --verbose -D --mode=644 "${srcdir}/settings.json.sample" -t "${pkgdir}/etc/mullvad-vpn/settings.json"
+ install --verbose -D --mode=644 "${srcdir}/settings.json.sample" -t "${pkgdir}/etc/mullvad-vpn"
# Install license
install --verbose -D --mode=644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/mullvad-vpn-cli.install b/mullvad-vpn-cli.install
index d9af43e7b1e0..de235d170990 100644
--- a/mullvad-vpn-cli.install
+++ b/mullvad-vpn-cli.install
@@ -6,6 +6,12 @@ pre_install() {
}
post_install() {
+ echo 'Copying sample settings...'
+ if [[ ! -e /etc/mullvad-vpn/settings.json ]]; then
+ cp -av /etc/mullvad-vpn/settings.json.sample \
+ /etc/mullvad-vpn/settings.json
+ echo 'Please edit /etc/mullvad-vpn/settings.json'
+ fi
echo 'Enabling Mullvad VPN daemon...'
systemctl enable --now mullvad-daemon
}