fix errors

3 files changed, 53 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed4341421b57..6258eebca19e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffbox
 	pkgdesc = An user-friendly ffmpeg GUI.一个多媒体转码百宝箱 / 一个 FFmpeg 的套壳
 	pkgver = 3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/ttqftech/FFBox
 	arch = any
 	license = custom
@@ -9,14 +9,14 @@ pkgbase = ffbox
 	makedepends = yarn
 	makedepends = npm
 	makedepends = nodejs
-	depends = bash
+	makedepends = nvm
+	makedepends = git
 	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-3.0::git+https://github.com/ttqftech/FFBox.git#tag=v3.0
 	source = ffbox.sh
-	sha256sums = 9615592ca3aaf39aec7fe65bdf9da04bacb5835900eda45be5fb5d9fb210a4be
-	sha256sums = 2d10014425ccd0153983875ae5732f7253b6e5d9516499f6a3f4db20bade017a
+	sha256sums = SKIP
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = ffbox
diff --git a/PKGBUILD b/PKGBUILD
index 53478e6e8075..8bed5fd2a646 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,53 @@
 pkgname=ffbox
 _pkgname=FFBox
 pkgver=3.0
-pkgrel=2
+_electronversion=8
+pkgrel=3
 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' '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'
-            '2d10014425ccd0153983875ae5732f7253b6e5d9516499f6a3f4db20bade017a')
-prepare() {
-    gendesk -f -n -q --categories "AudioVideo;Utility" --name "${pkgname}" --exec "${pkgname}"
+depends=(
+    "electron${_electronversion}"
+    'ffmpeg'
+)
+makedepends=(
+    'gendesk'
+    'yarn'
+    'npm'
+    'nodejs'
+    'nvm'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 16
+    nvm use 16
 }
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    rm -rf yarn.lock
-    yarn
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
+    _ensure_local_nvm
+    gendesk -f -n -q --categories "AudioVideo;Utility" --name "${pkgname}" --exec "${pkgname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    yarn config set cache-folder "${srcdir}/.yarn_cache"
+    yarn install --no-lockfile
     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" -t "${pkgdir}/opt/${pkgname}/resources"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist_electron/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
     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}"
+    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}"
 }
\ No newline at end of file
diff --git a/ffbox.sh b/ffbox.sh
index 6b210a704465..2ec4412e5c4f 100644
--- a/ffbox.sh
+++ b/ffbox.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron8
-_ASAR="/opt/ffbox/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