summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2022-05-29 11:29:50 -0600
committerMark Wagie2022-05-29 11:29:50 -0600
commit279ebd3c3926bdb711e00cc11a68173790d59af4 (patch)
tree8b7507631659b6b9c066b4a0e234d5d03e601bf7
parent44ca62fa5b6811c768e0233e3918f3188d8f3fe8 (diff)
downloadaur-279ebd3c3926bdb711e00cc11a68173790d59af4.tar.gz
use git commit hash instead of tag
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD26
2 files changed, 12 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e8bc762cd251..55ab69a65b08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,7 @@ pkgbase = mullvad-vpn-beta
provides = mullvad-vpn
conflicts = mullvad-vpn
options = !lto
- source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2022.2-beta1?signed
+ source = git+https://github.com/mullvad/mullvadvpn-app.git#commit=b02998e203ef50c2f799051d149fdb6083c51a5c?signed
source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=b63c5c8c7977963aeb585b6ddd4537dffe2aeeec?signed
source = mullvad-vpn.sh
validpgpkeys = EA0A77BF9E115615FC3BD8BC7653B940E494FE87
diff --git a/PKGBUILD b/PKGBUILD
index 7b4e937b53ae..4217ca3fc286 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,7 @@
# Contributor: Emīls Piņķis <emil at mullvad dot net>
# Contributor: Andrej Mihajlov <and at mullvad dot net>
pkgname=mullvad-vpn-beta
-_pkgver=2022.2
-_channel=beta
-_rel=1
-# beta
-pkgver=${_pkgver}.${_channel}${_rel}
-# stable
-#pkgver=${_pkgver}.${_channel}
+pkgver=2022.2.beta1
pkgrel=1
pkgdesc="The Mullvad VPN client app for desktop (beta channel)"
arch=('x86_64')
@@ -23,20 +17,22 @@ provides=("${pkgname%-beta}")
conflicts=("${pkgname%-beta}")
options=('!lto')
install="${pkgname%-beta}.install"
+_tag=b02998e203ef50c2f799051d149fdb6083c51a5c
_commit=b63c5c8c7977963aeb585b6ddd4537dffe2aeeec
-source=(
- "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}-${_channel}${_rel}?signed" # beta
-# "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}?signed" # stable
+source=("git+https://github.com/mullvad/mullvadvpn-app.git#commit=${_tag}?signed"
"git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=${_commit}?signed"
- "${pkgname%-beta}.sh"
- )
+ "${pkgname%-beta}.sh")
sha256sums=('SKIP'
'SKIP'
'a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4')
-validpgpkeys=('EA0A77BF9E115615FC3BD8BC7653B940E494FE87' # Linus Färnstrand (code signing key) <linus@mullvad.net>
+validpgpkeys=('EA0A77BF9E115615FC3BD8BC7653B940E494FE87' # Linus Färnstrand (code signing key <linus@mullvad.net>
'8339C7D2942EB854E3F27CE5AEE9DECFD582E984' # David Lönnhager (code signing) <david.l@mullvad.net>
- '4B986EF5222BA1B810230C602F391DE6B00D619C' # Oskar Nyberg (code signing) <oskar@mullvad.net>
- )
+ '4B986EF5222BA1B810230C602F391DE6B00D619C') # Oskar Nyberg (code signing) <oskar@mullvad.net>
+
+pkgver() {
+ cd "$srcdir/mullvadvpn-app"
+ git describe --tags | sed 's/-/./g'
+}
prepare() {
cd "$srcdir/mullvadvpn-app"