fix errors

3 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dfdf87fc3c6..ed4341421b57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = ffbox
 	pkgdesc = An user-friendly ffmpeg GUI.一个多媒体转码百宝箱 / 一个 FFmpeg 的套壳
 	pkgver = 3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ttqftech/FFBox
 	arch = any
 	license = custom
 	makedepends = gendesk
 	makedepends = yarn
-	makedepends = nvm
+	makedepends = npm
+	makedepends = nodejs
 	depends = bash
 	depends = electron8
 	depends = ffmpeg
+	optdepends = nvm: change the nodejs version to 16
 	conflicts = ffbox
 	source = ffbox-3.0.tar.gz::https://github.com/ttqftech/FFBox/archive/refs/tags/v3.0.tar.gz
 	source = ffbox.sh
 	sha256sums = 9615592ca3aaf39aec7fe65bdf9da04bacb5835900eda45be5fb5d9fb210a4be
-	sha256sums = 29884b1a180763d67eb9a7eaabaa4e46acbae31d6d9bff14106688ae3cc58628
+	sha256sums = 2d10014425ccd0153983875ae5732f7253b6e5d9516499f6a3f4db20bade017a
 
 pkgname = ffbox
diff --git a/PKGBUILD b/PKGBUILD
index b1153361c7e1..53478e6e8075 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,31 @@
 pkgname=ffbox
 _pkgname=FFBox
 pkgver=3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An user-friendly ffmpeg GUI.一个多媒体转码百宝箱 / 一个 FFmpeg 的套壳"
 arch=('any')
 url="https://github.com/ttqftech/FFBox"
 license=('custom')
 conflicts=("${pkgname}")
 depends=('bash' 'electron8' 'ffmpeg')
-makedepends=('gendesk' 'yarn' 'nvm')
+makedepends=('gendesk' 'yarn' 'npm' 'nodejs')
+optdepends=('nvm: change the nodejs version to 16')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
     "${pkgname}.sh")
 sha256sums=('9615592ca3aaf39aec7fe65bdf9da04bacb5835900eda45be5fb5d9fb210a4be'
-            '29884b1a180763d67eb9a7eaabaa4e46acbae31d6d9bff14106688ae3cc58628')
+            '2d10014425ccd0153983875ae5732f7253b6e5d9516499f6a3f4db20bade017a')
+prepare() {
+    gendesk -f -n -q --categories "AudioVideo;Utility" --name "${pkgname}" --exec "${pkgname}"
+}
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     rm -rf yarn.lock
-    nvm use 16
-    yarn install
-    yarn electron:build 
+    yarn
+    yarn electron:build
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/dist_electron/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${pkgname}/${pkgname}.asar"
-    gendesk -f -n --categories "AudioVideo;Utility" --name "${pkgname}" --exec "${pkgname}"
+    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/dist_electron/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/public/images/256.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/dist_electron/linux-unpacked/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/ffbox.sh b/ffbox.sh
index dd55c9a17ef2..6b210a704465 100644
--- a/ffbox.sh
+++ b/ffbox.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron8
-_ASAR="/opt/ffbox/ffbox.asar"
+_ASAR="/opt/ffbox/resources/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else