use bundled nodejs in artifact

3 files changed, 9 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97298ca48aa0..bc2bd116a973 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden-cli-git
 	pkgdesc = Bitwarden Command-line Interface
-	pkgver = 1.3.0.r26.gbe1e03c
+	pkgver = 1.7.4.r17.g3915e43
 	pkgrel = 1
 	url = https://github.com/bitwarden/cli
 	arch = x86_64
@@ -12,10 +12,8 @@ pkgbase = bitwarden-cli-git
 	options = !strip
 	source = bitwarden-cli-git-repo::git+https://github.com/bitwarden/cli.git
 	source = jslib-git-repo::git+https://github.com/bitwarden/jslib.git
-	source = bw.sh
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 71729c0ee95429ab03fa586de6bbf8ebad29d6d5544775564bb35eaa68cc4a915007db54b5928e99234bfe7828491829a5d32750f641056a0b68e05aa842f9ee
 
 pkgname = bitwarden-cli-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 89b36da7c33b..6e3834cb6a54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden-cli-git
 _pkgname=bitwarden-cli
-pkgver=1.3.0.r26.gbe1e03c
+pkgver=1.7.4.r17.g3915e43
 pkgrel=1
 pkgdesc='Bitwarden Command-line Interface'
 arch=('x86_64')
@@ -13,11 +13,9 @@ depends=('nodejs')
 conflicts=('bitwarden-cli')
 options=('!strip')
 source=("${_pkgname}-git-repo::git+https://github.com/bitwarden/cli.git"
-        'jslib-git-repo::git+https://github.com/bitwarden/jslib.git'
-        'bw.sh')
+        'jslib-git-repo::git+https://github.com/bitwarden/jslib.git')
 sha512sums=('SKIP'
-            'SKIP'
-            '71729c0ee95429ab03fa586de6bbf8ebad29d6d5544775564bb35eaa68cc4a915007db54b5928e99234bfe7828491829a5d32750f641056a0b68e05aa842f9ee')
+            'SKIP')
 
 pkgver() {
   cd "${_pkgname}-git-repo"
@@ -25,24 +23,20 @@ pkgver() {
 }
 
 prepare() {
-  cd "${_pkgname}-git-repo"
-  git submodule init
-  git config submodule.jslib.url $srcdir/jslib-git-repo
-  git submodule update
+  rmdir "${srcdir}/${_pkgname}-git-repo/jslib"
+  ln -s "${srcdir}/jslib-git-repo" "${srcdir}/${_pkgname}-git-repo/jslib"
+  sed -i 's/"postinstall": "npm run sub:init",//' "${_pkgname}-git-repo/package.json"
 }
 
 build() {
   cd "${_pkgname}-git-repo"
   npm install
-  npm run build:prod
+  npm run dist:lin
 }
 
 package() {
   cd "${_pkgname}-git-repo"
-  
-  install -dm755 "${pkgdir}/usr/lib/${_pkgname}"
-  cp -a build/. "${pkgdir}/usr/lib/${_pkgname}/"
 
   install -dm755 "${pkgdir}/usr/bin"
-  install -Dm755 "${srcdir}/bw.sh" "${pkgdir}/usr/bin/bw"
+  install -Dm755 ./dist/linux/bw "${pkgdir}/usr/bin/bw"
 }
diff --git a/bw.sh b/bw.sh
deleted file mode 100644
index 6814da8ae156..000000000000
--- a/bw.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-node /usr/lib/bitwarden-cli/bw.js $@