update to 2.7.2

3 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64a10a9914af..cb8577e3094e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = dicionario.js-bin
 	pkgdesc = Simple dictionary in which you record your own words.
-	pkgver = 2.7.1
+	pkgver = 2.7.2
 	pkgrel = 1
 	url = https://github.com/ArthurLobopro/dicionario.js
 	arch = x86_64
 	license = MIT
-	makedepends = asar
-	depends = bash
 	depends = electron26
-	provides = dicionario.js=2.7.1
+	provides = dicionario.js=2.7.2
 	conflicts = dicionario.js
-	source = dicionario.js-2.7.1.deb::https://github.com/ArthurLobopro/dicionario.js/releases/download/v2.7.1/dicionario.js_2.7.1_amd64.deb
+	source = dicionario.js-2.7.2.deb::https://github.com/ArthurLobopro/dicionario.js/releases/download/v2.7.2/dicionario.js_2.7.2_amd64.deb
 	source = dicionario.js.sh
-	sha256sums = 7cf7a8371dda2b74c4a5319fd6e900136552e1815c008bc2a5b85a74407fc88c
-	sha256sums = f3edc91995c5d57da033149ecad845a0cc12fa62fc869413aee152ff210e3665
+	sha256sums = 7908055fc91c0e6953563694f0167ae8e1962ae19cf6ccaeaabcc32147241acc
+	sha256sums = 33b63dd162c587ddc205d259e7596f0ae149b11f3a241d2d02b00401bc379a8d
 
 pkgname = dicionario.js-bin
diff --git a/PKGBUILD b/PKGBUILD
index df653f9f94ae..6ffac465c449 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=dicionario.js-bin
-pkgver=2.7.1
+pkgver=2.7.2
 pkgrel=1
 pkgdesc="Simple dictionary in which you record your own words."
 arch=('x86_64')
@@ -8,12 +8,15 @@ url="https://github.com/ArthurLobopro/dicionario.js"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron26')
-makedepends=('asar')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
-    "${pkgname%-bin}.sh")
-sha256sums=('7cf7a8371dda2b74c4a5319fd6e900136552e1815c008bc2a5b85a74407fc88c'
-            'f3edc91995c5d57da033149ecad845a0cc12fa62fc869413aee152ff210e3665')
+depends=(
+    'electron26'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('7908055fc91c0e6953563694f0167ae8e1962ae19cf6ccaeaabcc32147241acc'
+            '33b63dd162c587ddc205d259e7596f0ae149b11f3a241d2d02b00401bc379a8d')
 build() {
     bsdtar -xf "${srcdir}/data.tar.zst"
     asar pack "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${srcdir}/app.asar"
@@ -21,7 +24,8 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/doc/${pkgname%-bin}/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
diff --git a/dicionario.js.sh b/dicionario.js.sh
index 7ff31a3af37f..38d03bb4ef07 100644
--- a/dicionario.js.sh
+++ b/dicionario.js.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron26
-_ASAR="/opt/dicionario.js/resources/app.asar"
+APPDIR="/usr/lib/dicionario.js"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else