diff options
author | yochananmarqos | 2019-11-03 08:41:27 -0700 |
---|---|---|
committer | yochananmarqos | 2019-11-03 08:41:27 -0700 |
commit | 94a08949a0a596c5fb364dae358ea6ddb0e9a2a9 (patch) | |
tree | 3a063589e96099de106930a0868657bf2d3efa67 | |
parent | 61e2bfca85ff0e589fb296b37fff72a0e1a8a736 (diff) | |
download | aur-94a08949a0a596c5fb364dae358ea6ddb0e9a2a9.tar.gz |
PKGBUILD rewrite, use deb as source
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | .gitignore | 13 | ||||
-rw-r--r-- | PKGBUILD | 62 | ||||
-rw-r--r-- | mullvad-vpn-bin.install | 13 | ||||
-rw-r--r-- | mullvad-vpn.install | 42 |
5 files changed, 73 insertions, 74 deletions
@@ -1,9 +1,9 @@ pkgbase = mullvad-vpn - pkgdesc = VPN Client for Mullvad.net, a bitcoin-friendly VPN for anonymity and privacy + pkgdesc = The Mullvad VPN client app for desktop pkgver = 2019.9 - pkgrel = 3 + pkgrel = 4 url = https://www.mullvad.net - install = mullvad-vpn-bin.install + install = mullvad-vpn.install arch = x86_64 license = GPL3 depends = gconf @@ -12,14 +12,11 @@ pkgbase = mullvad-vpn depends = libappindicator-gtk2 depends = libxss depends = nss - provides = mullvad-vpn - conflicts = mullvad-vpn-old - replaces = mullvad-vpn-old - source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_x86_64.rpm - source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_x86_64.rpm.asc + source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb + source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb.asc validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF - md5sums = 046015c4657582c4b47392203f4ea08e - md5sums = SKIP + sha256sums = 4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1 + sha256sums = SKIP pkgname = mullvad-vpn diff --git a/.gitignore b/.gitignore index 07c45057e4ef..1eda0cac5061 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ -*.tar.xz -src/ -pkg/ -*.asc -*.rpm +# Ignore everything +* + +# But not these files... +!.gitignore +!PKGBUILD +!.SRCINFO +!mullvad-vpn.install @@ -1,55 +1,25 @@ -# Maintainer: Matthew McGinn <mamcgi@gmail.com> -# Contributor: alicewww <almw@protonmail.com> - +# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com> +# Contributor: Matthew McGinn <mamcgi at gmail dot com> +# Contributor: alicewww <almw at protonmail dot com> pkgname=mullvad-vpn pkgver=2019.9 -pkgrel=3 -pkgdesc="VPN Client for Mullvad.net, a bitcoin-friendly VPN for anonymity and privacy" -_github_url="https://github.com/mullvad/mullvadvpn-app" +pkgrel=4 +pkgdesc="The Mullvad VPN client app for desktop" url="https://www.mullvad.net" arch=('x86_64') license=('GPL3') depends=('gconf' 'gtk3' 'libnotify' 'libappindicator-gtk2' 'libxss' 'nss') -conflicts=('mullvad-vpn-old') -replaces=('mullvad-vpn-old') -provides=($pkgname) -install=$pkgname-bin.install -validpgpkeys=("A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF") # Mullvad (code signing) <admin@mullvad.net> -source=("https://github.com/mullvad/mullvadvpn-app/releases/download/${pkgver}/MullvadVPN-${pkgver}_${arch}.rpm" -"https://github.com/mullvad/mullvadvpn-app/releases/download/${pkgver}/MullvadVPN-${pkgver}_${arch}.rpm.asc") - -md5sums=('046015c4657582c4b47392203f4ea08e' - 'SKIP') +install="$pkgname.install" +source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$pkgver/MullvadVPN-${pkgver}_amd64.deb"{,.asc}) +sha256sums=('4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1' + 'SKIP') +validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin@mullvad.net> package() { - # Install systemd service - sed -i 's/Mullvad\\x20VPN/mullvad-vpn/g' "opt/Mullvad VPN/resources/mullvad-daemon.service" - install -Dm644 "opt/Mullvad VPN/resources/mullvad-daemon.service" \ - "${pkgdir}/usr/lib/systemd/system/mullvad-daemon.service" - - # Install the main files. - install -d "${pkgdir}/opt/${pkgname}" - cp -a "${srcdir}/opt/Mullvad VPN/." "${pkgdir}/opt/${pkgname}" - - # Make it exec - chmod 755 "${pkgdir}/opt/${pkgname}/mullvad-gui" - - # Main binary - mkdir -p ${pkgdir}/usr/bin - ln -s "/opt/${pkgname}/mullvad-gui" "${pkgdir}/usr/bin/${pkgname}" - ln -s "/opt/${pkgname}/resources/mullvad-problem-report" "${pkgdir}/usr/bin/mullvad-problem-report" - - # Desktop Entry - install -d "${pkgdir}/usr/share/applications" - sed -i 's/Exec=.*/Exec=\/usr\/bin\/mullvad-vpn/g' \ - "usr/share/applications/${pkgname}.desktop" - install -Dm644 "usr/share/applications/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - # CLI binary - install -m755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad" - - # Icons - install -dm755 "${pkgdir}/usr/share/icons/hicolor" - cp -a "${srcdir}/usr/share/icons/hicolor/." "${pkgdir}/usr/share/icons/hicolor" + tar -xvf data.tar.xz -C "$pkgdir" + + ln -s "/opt/Mullvad VPN/mullvad-gui" "$pkgdir/usr/bin/$pkgname" + + install -Dm644 "$pkgdir/opt/Mullvad VPN/resources/mullvad-daemon.service" \ + "$pkgdir/usr/lib/systemd/system/mullvad-daemon.service" } diff --git a/mullvad-vpn-bin.install b/mullvad-vpn-bin.install deleted file mode 100644 index a60c2504f804..000000000000 --- a/mullvad-vpn-bin.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - echo ------------------------------------------------------------- - echo 'You need to restart the mullvad daemon' - echo '# systemctl restart mullvad-daemon' - echo ------------------------------------------------------------- -} - -post_install() { - echo ------------------------------------------------------------- - echo 'Make sure to enable and run the mullvad daemon' - echo '# systemctl enable --now mullvad-daemon' - echo ------------------------------------------------------------- -} diff --git a/mullvad-vpn.install b/mullvad-vpn.install new file mode 100644 index 000000000000..6fe7d441bf1f --- /dev/null +++ b/mullvad-vpn.install @@ -0,0 +1,42 @@ +pre_install() { + if systemctl status mullvad-daemon &> /dev/null; then + echo 'Stopping & disabling Mullvad VPN daemon...' + systemctl disable --now mullvad-daemon + fi + + rm -f /var/cache/mullvad-vpn/relays.json || true +} + +post_install() { + echo 'Enabling Mullvad VPN daemon...' + systemctl enable --now mullvad-daemon +} + +pre_upgrade() { + echo 'Stopping Mullvad VPN daemon...' + systemctl stop mullvad-daemon +} + +post_upgrade() { + echo 'Restarting Mullvad VPN daemon...' + systemctl daemon-reload + systemctl start mullvad-daemon +} + +pre_remove() { + # the user might've disabled or stopped the service themselves already + echo 'Making sure the Mullvad VPN daemon is stopped & disabled...' + systemctl stop mullvad-daemon || true + systemctl disable mullvad-daemon || true +} + +post_remove() { + echo ------------------------------------------------------------- + echo 'Optionally remove logs & cache:' + echo 'sudo rm -rf /var/log/mullvad-vpn/' + echo 'sudo rm -rf /var/cache/mullvad-vpn/' + echo '' + echo 'Optionally remove config:' + echo 'sudo rm -rf /etc/mullvad-vpn' + echo ------------------------------------------------------------- +} |