update to 1.4.6

3 files changed, 50 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3bb02b4b499..dc645b249221 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
 pkgbase = chain-desktop-wallet-bin
 	pkgdesc = Crypto.com DeFi Desktop Wallet
-	pkgver = 1.4.5
+	pkgver = 1.4.6
 	pkgrel = 1
 	url = https://crypto.com/defi-wallet
 	arch = x86_64
 	license = Apache
 	makedepends = squashfuse
-	depends = bash
 	depends = electron19
-	provides = chain-desktop-wallet=1.4.5
+	depends = libx11
+	depends = gdk-pixbuf2
+	depends = libxext
+	depends = libdbusmenu-glib
+	depends = gtk2
+	depends = dbus-glib
+	provides = chain-desktop-wallet=1.4.6
 	conflicts = chain-desktop-wallet
-	source = chain-desktop-wallet-1.4.5.AppImage::https://github.com/crypto-com/chain-desktop-wallet/releases/download/v1.4.5/Crypto.com-DeFi-Desktop-Wallet-1.4.5.AppImage
+	source = chain-desktop-wallet-1.4.6.AppImage::https://github.com/crypto-com/chain-desktop-wallet/releases/download/v1.4.6/Crypto.com-DeFi-Desktop-Wallet-1.4.6.AppImage
 	source = chain-desktop-wallet.sh
-	sha256sums = e3dffdf9f12cbb2cf800a80c3f2e520d842a1525d43844cc544cd2599b773e68
-	sha256sums = 091d1f9251158c9d6503cae3a5c60f21697957a9c5bbacc0c9dfa1e037f2bbf4
+	sha256sums = 4e02ffb9e4322438b414b6040455b1a43a674a910437abdc274806f0d2d47e82
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = chain-desktop-wallet-bin
diff --git a/PKGBUILD b/PKGBUILD
index d1085770869f..16f4642ac1bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,38 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=chain-desktop-wallet-bin
-pkgver=1.4.5
+pkgver=1.4.6
+_electronversion=19
 pkgrel=1
 pkgdesc="Crypto.com DeFi Desktop Wallet"
 arch=('x86_64')
 url="https://crypto.com/defi-wallet"
-_githuburl="https://github.com/crypto-com/chain-desktop-wallet"
+_ghurl="https://github.com/crypto-com/chain-desktop-wallet"
 license=("Apache")
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron19')
-makedepends=('squashfuse')
-source=("${pkgname%-bin}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/Crypto.com-DeFi-Desktop-Wallet-${pkgver}.AppImage"
-    "${pkgname%-bin}.sh")
-sha256sums=('e3dffdf9f12cbb2cf800a80c3f2e520d842a1525d43844cc544cd2599b773e68'
-            '091d1f9251158c9d6503cae3a5c60f21697957a9c5bbacc0c9dfa1e037f2bbf4')
+depends=(
+    "electron${_electronversion}"
+    'libx11'
+    'gdk-pixbuf2'
+    'libxext'
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
+)
+makedepends=(
+    'squashfuse'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/Crypto.com-DeFi-Desktop-Wallet-${pkgver}.AppImage"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('4e02ffb9e4322438b414b6040455b1a43a674a910437abdc274806f0d2d47e82'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
@@ -23,10 +40,10 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
-    install -Dm644 "${srcdir}/squashfs-root/resources/scripts/preload.js" -t "${pkgdir}/opt/${pkgname%-bin}/resources/scripts"
-    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/opt/${pkgname%-bin}/resources"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/opt/${pkgname%-bin}/usr/lib"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/resources/scripts/preload.js" -t "${pkgdir}/usr/lib/${pkgname%-bin}/scripts"
+    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/chain-desktop-wallet.sh b/chain-desktop-wallet.sh
index 27ef0691d416..2ec4412e5c4f 100644
--- a/chain-desktop-wallet.sh
+++ b/chain-desktop-wallet.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron19
-APPDIR="/opt/chain-desktop-wallet"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/resources/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file