[arch-commits] Commit in bitwarden/trunk (PKGBUILD bitwarden.sh package.json.patch)

[Alexander Epaneshnikov]

    Date: Wednesday, October 27, 2021 @ 22:48:34
  Author: alex19ep
Revision: 1034808

upgpkg: bitwarden 1.29.0-1

new upstream release

Modified:
  bitwarden/trunk/PKGBUILD
  bitwarden/trunk/bitwarden.sh
  bitwarden/trunk/package.json.patch

--------------------+
 PKGBUILD           |   40 +++++++++++++++++++++-------------------
 bitwarden.sh       |    3 ++-
 package.json.patch |    4 ++--
 3 files changed, 25 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-27 21:51:49 UTC (rev 1034807)
+++ PKGBUILD	2021-10-27 22:48:34 UTC (rev 1034808)
@@ -2,15 +2,16 @@
 # Contributor: libertylocked <libertylocked at disroot.org>
 
 pkgname=bitwarden
-pkgver=1.28.3
+pkgver=1.29.0
 pkgrel=1
-_jslibcommit='1c28396d1a819d9d7838c65517c9953a078b29bb'
+_jslibcommit='764dc40b36e0000807e59b8d6feea5ac4577270d'
+_electronversion=14
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')
 url='https://github.com/bitwarden/desktop'
 license=('GPL3')
-depends=('electron11' 'libnotify' 'libsecret' 'libxtst' 'libxss' 'libnss_nis')
-makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq')
+depends=("electron$_electronversion" 'libnotify' 'libsecret' 'libxtst' 'libxss' 'libnss_nis')
+makedepends=('npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archive/v${pkgver}.tar.gz
         jslib-${_jslibcommit}.tar.gz::https://github.com/bitwarden/jslib/archive/${_jslibcommit}.tar.gz
         package.json.patch
@@ -17,11 +18,11 @@
         messaging.main.ts.patch
         ${pkgname}.sh
         ${pkgname}.desktop)
-sha512sums=('d140fe33977e964d2075854b29f53fa0aa01ec104b959b64a648292958da8bad9ba9ee85d174fed6229282d1077e7252cf8caf259b6e7206a88dd26cee19a2a8'
-            '2d15bfa4554dcb355f070cbbdeff1a26e132a316184b7e6e2a4376ff9549529692d718e6265c5fd62d42f4eef2fc62aacb4bb89c95f698f2493212f8a4abb516'
-            'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e'
+sha512sums=('70323734681fa766390ac00831f371bff3ee023169e27b5348216e9cbf9fbaa8e14d4d689d5d5aa3ffc36b88c0b71b23a90c0cf418f7fc60ac5feae6f8bfea2d'
+            '08fcfa6e23e405d1a01238268ae55bef263f91173d1d28ec96e20cdc892229304c0b84dfcb3c722615f8dd6bb46cb9c3fad21ace46da06d4a349e1008e49e559'
+            '87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015'
             '822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
-            '32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'
+            '44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc'
             '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
 
 prepare() {
@@ -34,11 +35,11 @@
 	patch --strip=1 package.json ../package.json.patch
 	# This patch is required to make "Start automatically on login" work
 	patch --strip=1 src/main/messaging.main.ts ../messaging.main.ts.patch
-
 	# Patch build to make it work with system electron
-	SYSTEM_ELECTRON_VERSION=$(electron11 -v | sed 's/v//g')
-	jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION \
-	   '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron11"' \
+	export SYSTEM_ELECTRON_VERSION=$(electron$_electronversion -v | sed 's/v//g')
+	export ELECTRONVERSION=$_electronversion
+	jq < package.json \
+	   '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | .build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
 	   > package.json.patched
 	mv package.json.patched package.json
 }
@@ -45,10 +46,10 @@
 
 build() {
 	cd desktop-${pkgver}
+	electronDist=/usr/lib/electron$_electronversion
+	electronVer=$(electron$_electronversion --version | tail -c +2)
 	export npm_config_cache="$srcdir/npm_cache"
 	export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-	electronDist=$(dirname $(realpath $(which electron11)))
-	electronVer=$(electron11 --version | tail -c +2)
 	pushd jslib
 	npm install
 	popd
@@ -61,13 +62,14 @@
 
 package(){
 	cd desktop-${pkgver}
-	install -vDm755 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}/resources"
+	install -vDm644 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+	install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}"
 
 	for i in 16 32 48 64 128 256 512; do
-		install -vDm644 resources/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname%-git}.png"
+		install -vDm644 resources/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
 	done
-	install -vDm644 resources/icon.png "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname%-git}.png"
+	install -vDm644 resources/icon.png "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png"
 
-	install -vDm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/bitwarden-desktop"
-	install -vDm644 "${srcdir}"/${pkgname%-git}.desktop -t "${pkgdir}"/usr/share/applications
+	install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/bitwarden-desktop"
+	install -vDm644 "${srcdir}"/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications
 }

Modified: bitwarden.sh
===================================================================
--- bitwarden.sh	2021-10-27 21:51:49 UTC (rev 1034807)
+++ bitwarden.sh	2021-10-27 22:48:34 UTC (rev 1034808)
@@ -1,3 +1,4 @@
 #!/bin/sh
 export ELECTRON_IS_DEV=0
-exec electron11 /usr/lib/bitwarden/resources/app.asar $@
\ No newline at end of file
+cd /usr/lib/bitwarden
+exec electron14 /usr/lib/bitwarden/app.asar $@

Modified: package.json.patch
===================================================================
--- package.json.patch	2021-10-27 21:51:49 UTC (rev 1034807)
+++ package.json.patch	2021-10-27 22:48:34 UTC (rev 1034808)
@@ -5,9 +5,9 @@
      "sub:pull": "git submodule foreach git pull origin master",
      "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"",
 -    "preinstall": "npm run sub:init",
--    "postinstall": "patch-package && electron-rebuild",
+-    "postinstall": "electron-rebuild",
 +    "preinstall": "",
-+    "postinstall": "patch-package",
++    "postinstall": "",
      "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
      "symlink:mac": "npm run symlink:lin",
      "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",