fix errors

3 files changed, 29 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfd72f9c1d97..fb86d6e24c4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = ffbox-bin
 	pkgdesc = An user-friendly ffmpeg GUI.一个多媒体转码百宝箱/一个 FFmpeg 的套壳
 	pkgver = 4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ttqftech/FFBox
 	arch = x86_64
 	license = LicenseRef-custom
-	depends = electron24-bin
 	depends = ffmpeg
+	depends = gtk3
+	depends = nspr
+	depends = nss
 	provides = ffbox=4.0
 	conflicts = ffbox
+	options = !strip
 	source = ffbox-4.0.deb::https://github.com/ttqftech/FFBox/releases/download/v4.0/Linux_x86-64_FFBox_4.0.deb
 	source = LICENSE-4.0::https://raw.githubusercontent.com/ttqftech/FFBox/v4.0/LICENSE
-	source = ffbox.sh
 	sha256sums = eb1a0d0afbde1288ca9ffa5876a18a40c6027e9587a6c943f8fa702b4e18afcc
 	sha256sums = 67ed2b6388724e58664564bf21e73eb1e00dbfe513c70fff71f20517e38dfbca
-	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = ffbox-bin
diff --git a/PKGBUILD b/PKGBUILD
index b7afcb29be8b..c4ff99ba2f61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=ffbox-bin
 _pkgname=FFBox
 pkgver=4.0
 _electronversion=24
-pkgrel=1
+pkgrel=2
 pkgdesc="An user-friendly ffmpeg GUI.一个多媒体转码百宝箱/一个 FFmpeg 的套壳"
 arch=('x86_64')
 url="https://github.com/ttqftech/FFBox"
@@ -11,31 +11,40 @@ license=('LicenseRef-custom')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
-    "electron${_electronversion}-bin"
+    #"electron${_electronversion}-bin"
     'ffmpeg'
+    'gtk3'
+    'nspr'
+    'nss'
+)
+options=(
+    '!strip'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/Linux_${CARCH//_/-}_${_pkgname}_${pkgver}.deb"
     "LICENSE-${pkgver}::https://raw.githubusercontent.com/ttqftech/FFBox/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh"
+    #"${pkgname%-bin}.sh"
 )
 sha256sums=('eb1a0d0afbde1288ca9ffa5876a18a40c6027e9587a6c943f8fa702b4e18afcc'
-            '67ed2b6388724e58664564bf21e73eb1e00dbfe513c70fff71f20517e38dfbca'
-            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+            '67ed2b6388724e58664564bf21e73eb1e00dbfe513c70fff71f20517e38dfbca')
 build() {
-    sed -e "s|@electronversion@|${_electronversion}|" \
-        -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@runname@|app|g" \
-        -e "s|@options@||g" \
-        -i "${srcdir}/${pkgname%-bin}.sh"
+    #sed -e "s|@electronversion@|${_electronversion}|" \
+    #    -e "s|@appname@|${pkgname%-bin}|g" \
+    #    -e "s|@runname@|app|g" \
+    #    -e "s|@options@||g" \
+    #    -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
-    sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    sed "s|\"..\/FFBoxService\"),Y|\"..\/..\/${pkgname%-bin}\/FFBoxService\"),Y|g" -i "${srcdir}/opt/${_pkgname}/resources/app/app/main/index.cjs"
+    #sed "s|/opt/${_pkgname}/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    #sed "s|\"..\/FFBoxService\"),Y|\"..\/..\/${pkgname%-bin}\/FFBoxService\"),Y|g" -i "${srcdir}/opt/${_pkgname}/resources/app/app/main/index.cjs"
 }
 package() {
-    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm755 "${srcdir}/opt/${_pkgname}/FFBoxService" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
-    cp -r  "${srcdir}/opt/${_pkgname}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    #install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    #install -Dm755 "${srcdir}/opt/${_pkgname}/FFBoxService" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    #cp -r  "${srcdir}/opt/${_pkgname}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    #install -Dm755 -d "${pkgdir}/"{opt/"${pkgname%-bin}",usr/bin}
+    #cp -r "${srcdir}/opt/${_pkgname}/" "${pkgdir}/opt/${pkgname%-bin}"
+    cp -r "${srcdir}/opt" "${pkgdir}"
+    #ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256;do
         install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
             -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
diff --git a/ffbox.sh b/ffbox.sh
deleted file mode 100644
index 7ddcaab8d734..000000000000
--- a/ffbox.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-_APPDIR="/usr/lib/@appname@"
-_RUNNAME="${_APPDIR}/@runname@"
-_OPTIONS="@options@"
-export PATH="${_APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-export ELECTRON_IS_DEV=0
-export ELECTRON_FORCE_IS_PACKAGED=true
-export NODE_ENV=production
-cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
-else
-    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
-fi
\ No newline at end of file