[arch-commits] Commit in vaultwarden-web/trunk (PKGBUILD)

[George Rawlinson]

    Date: Sunday, February 6, 2022 @ 06:57:32
  Author: grawlinson
Revision: 1126969

upgpkg: vaultwarden-web 2.25.1.b-2; FS#73642

Modified:
  vaultwarden-web/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-06 06:39:35 UTC (rev 1126968)
+++ PKGBUILD	2022-02-06 06:57:32 UTC (rev 1126969)
@@ -3,12 +3,12 @@
 # Contributor: Markus Richter <mqus at disroot dot org>
 
 pkgname=vaultwarden-web
-_pkgver=2.25.0
+_pkgver=2.25.1b
 pkgver=2.25.1.b
-_pkgver_without_last_dot=2.25.1b # i'm tired and i need more monty python
 _upstreamver=${_pkgver%[[:lower:]]}
-_patchver=$_pkgver
-pkgrel=1
+#_patchver=$_upstreamver
+_patchver=2.25.0 # almost always out of sync now
+pkgrel=2
 pkgdesc='Bitwarden web vault with the patches to make it work with Vaultwarden'
 arch=('any')
 url=https://github.com/dani-garcia/bw_web_builds
@@ -19,14 +19,18 @@
 replaces=('bitwarden_rs-vault' 'bitwarden_rs-web')
 install=$pkgname.install
 source=("bitwarden-web::git+https://github.com/bitwarden/web.git#tag=v$_upstreamver"
-        "$pkgname-v$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver_without_last_dot/patches/v$_patchver.patch")
+        "$pkgname-v$_pkgver-$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver/patches/v$_patchver.patch")
 b2sums=('SKIP'
-        '5023c74e342d9e416f8de2a781a846a1027fba28bf763330c196b8ed836bfc971bf156715beaf88f6a73c24c660f25f61d27457cc50a7bc6e1c4630001f3c989')
+        '2f527513d85b34ccaba4f6d890a84b265d0f9cf4469c439c7e12d885b399ddd357bdafadf48e55ef4c4842fb43052985130154b0dad6f1b1f007ebc0b053ea06')
 
+pkgver() {
+  echo $_pkgver | sed 's/[[:lower:]]$/.&/'
+}
+
 prepare() {
   cd bitwarden-web
   git submodule update --init
-  patch --forward --strip=1 --input=../$pkgname-v$_patchver.patch
+  patch --forward --strip=1 --input=../$pkgname-v$_pkgver-$_patchver.patch
 
   npm ci
 }