[arch-commits] Commit in bitwarden-cli/trunk (PKGBUILD)

[Alexander Epaneshnikov]

    Date: Wednesday, July 13, 2022 @ 11:32:03
  Author: alex19ep
Revision: 1252531

upgpkg: bitwarden-cli 2022.6.2-1

Modified:
  bitwarden-cli/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-13 11:07:12 UTC (rev 1252530)
+++ PKGBUILD	2022-07-13 11:32:03 UTC (rev 1252531)
@@ -2,8 +2,8 @@
 # Contributor: libertylocked <libertylocked at disroot.org>
 
 pkgname=bitwarden-cli
-pkgver=1.22.1
-pkgrel=2
+pkgver=2022.6.2 
+pkgrel=1
 pkgdesc="The command line vault"
 arch=('any')
 url="https://github.com/bitwarden/cli"
@@ -11,23 +11,27 @@
 depends=('nodejs')
 makedepends=('git' 'npm' 'modclean')
 options=(!emptydirs)
-source=(bitwarden-cli::git+https://github.com/bitwarden/cli.git#tag=v${pkgver}
+source=(bitwarden::git+https://github.com/bitwarden/clients.git#tag=cli-v${pkgver}
         bitwarden-jslib::git+https://github.com/bitwarden/jslib.git)
 sha512sums=('SKIP'
             'SKIP')
 
 prepare() {
-	cd bitwarden-cli
+	cd bitwarden
 	# Link jslib
 	git submodule init
 	git config submodule.jslib.url "$srcdir/bitwarden-jslib"
 	git submodule update
+
+	export npm_config_build_from_source=true
+	export npm_config_cache="$srcdir/npm_cache"
+
+	npm ci
 }
 
 build() {
-	cd bitwarden-cli
+	cd bitwarden/apps/cli
 	export npm_config_cache="$srcdir/npm_cache"
-	npm install
 	npm run build
 	npm run clean
 	node ./build/bw.js completion --shell zsh > _bw
@@ -34,7 +38,7 @@
 }
 
 package() {
-	cd bitwarden-cli
+	cd bitwarden/apps/cli
 	npm install --production -g --prefix "$pkgdir"/usr $(npm pack . | tail -1)
 
 	# Non-deterministic race in npm gives 777 permissions to random directories.