Date: Friday, December 2, 2022 @ 02:43:00
Author: grawlinson
Revision: 1356126
upgpkg: vaultwarden-web 2022.11.1-1; new upstream release
Modified:
vaultwarden-web/trunk/PKGBUILD
----------+
PKGBUILD | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-02 01:29:59 UTC (rev 1356125)
+++ PKGBUILD 2022-12-02 02:43:00 UTC (rev 1356126)
@@ -3,11 +3,11 @@
# Contributor: Markus Richter <mqus at disroot dot org>
pkgname=vaultwarden-web
-_pkgver=2022.10.2
-pkgver=2022.10.2
+_pkgver=2022.11.1
+pkgver=2022.11.1
_upstreamver=${_pkgver%[[:lower:]]}
#_patchver=$_upstreamver
-_patchver=2022.10.0 # almost always out of sync now
+_patchver=2022.11.1 # almost always out of sync now
pkgrel=1
pkgdesc='Bitwarden web vault with the patches to make it work with Vaultwarden'
arch=('any')
@@ -18,10 +18,12 @@
provides=('bitwarden_rs-vault' 'bitwarden_rs-web')
replaces=('bitwarden_rs-vault' 'bitwarden_rs-web')
install=$pkgname.install
-source=("bitwarden-clients::git+https://github.com/bitwarden/clients.git#tag=web-v$_upstreamver";
-
"$pkgname-v$_pkgver-$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver/patches/v$_patchver.patch";)
+source=(
+
"bitwarden-clients::git+https://github.com/bitwarden/clients.git#tag=web-v$_upstreamver";
+
"bw_web_builds::git+https://github.com/dani-garcia/bw_web_builds#tag=v$_pkgver";
+)
b2sums=('SKIP'
-
'3a4f2de3d62b4d1462d76bd58de048214bb5ff83ffe65c53710e6605d1c6c38c1138dc7fb9c09a92c050e24dc0dbe98acb7d76fd0aa7dd04acae39a06444faae')
+ 'SKIP')
pkgver() {
echo $_pkgver | sed 's/[[:lower:]]$/.&/'
@@ -29,21 +31,26 @@
prepare() {
cd bitwarden-clients
- git submodule update --init
- patch --forward --strip=1 --input=../$pkgname-v$_pkgver-$_patchver.patch
+ # copy vaultwarden images
+ cp -vr
"$srcdir/bw_web_builds/resources/"{logo-{dark,white}@2x,icon-white}.png
apps/web/src/images
+
+ # apply vaultwarden patch
+ patch --forward --strip=1
--input="$srcdir/bw_web_builds/patches/v$_patchver.patch"
+
npm ci
}
build() {
cd bitwarden-clients/apps/web
+
npm run dist:oss:selfhost
}
package() {
- cd bitwarden-clients/apps/web
- install -d "$pkgdir"/usr/share/webapps/$pkgname
- cp -R build/* "$pkgdir"/usr/share/webapps/$pkgname
+ install -d "$pkgdir/usr/share/webapps/$pkgname"
+
+ cp -R bitwarden-clients/apps/web/build/* "$pkgdir/usr/share/webapps/$pkgname"
}
# vim:set ts=2 sw=2 et:
