fix errors

3 files changed, 35 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb498b3d322a..31f10f5a003b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,9 +5,15 @@ pkgbase = fukayo-bin
 	url = https://github.com/JiPaix/Fukayo
 	arch = x86_64
 	license = MIT
-	makedepends = asar
+	makedepends = squashfuse
 	depends = electron24
-	depends = bash
+	depends = libx11
+	depends = gdk-pixbuf2
+	depends = libxext
+	depends = libdbusmenu-glib
+	depends = gtk2
+	depends = dbus-glib
+	depends = java-runtime
 	provides = fukayo=0.13.0
 	conflicts = fukayo
 	source = fukayo-0.13.0.AppImage::https://github.com/JiPaix/Fukayo/releases/download/v0.13.0/Fukayo-0.13.0.AppImage
@@ -15,6 +21,6 @@ pkgbase = fukayo-bin
 	source = fukayo.sh
 	sha256sums = f982a5dc87485a30ac82f8c77dd400733ee192aa8d34f28fb59f06b7205a7861
 	sha256sums = c3fb2affb5fa8ed0b1866d379461e7e0c845ac7011f67aa7410cfe080f8d753a
-	sha256sums = e93979ffeb57e6ac91eca7fcb55c9473932168a8e2d22ccef23cdef359479786
+	sha256sums = a32492ad76f370a025b09bef6d2e40de877455e5c8e8c67f79849b34cbc581cf
 
 pkgname = fukayo-bin
diff --git a/PKGBUILD b/PKGBUILD
index 76663c684cc8..116e60e5e8ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,25 +7,39 @@ pkgdesc="A desktop application to read your favorite manga/manhwa/manhua from yo
 arch=('x86_64')
 url="https://github.com/JiPaix/Fukayo"
 license=("MIT")
-depends=('electron24' 'bash')
-makedepends=('asar')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-source=("${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${_appname}-${pkgver}.AppImage"
+depends=(
+    'electron24' 
+    'libx11'
+    'gdk-pixbuf2'
+    'libxext'
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
+    'java-runtime'
+)
+makedepends=(
+    'squashfuse'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${_appname}-${pkgver}.AppImage"
     "LICENSE::https://raw.githubusercontent.com/JiPaix/fukayo/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('f982a5dc87485a30ac82f8c77dd400733ee192aa8d34f28fb59f06b7205a7861'
             'c3fb2affb5fa8ed0b1866d379461e7e0c845ac7011f67aa7410cfe080f8d753a'
-            'e93979ffeb57e6ac91eca7fcb55c9473932168a8e2d22ccef23cdef359479786')
-prepare() {
+            'a32492ad76f370a025b09bef6d2e40de877455e5c8e8c67f79849b34cbc581cf')
+build() {
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    asar pack "${srcdir}/squashfs-root/resources/app" "${srcdir}/${pkgname%-bin}.asar"
     sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    find "${srcdir}/squashfs-root/resources" -type d -exec chmod 755 {} \;
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
+    cp -r "${srcdir}/squashfs-root/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/fukayo.sh b/fukayo.sh
index be26a709f686..f5084032ba23 100644
--- a/fukayo.sh
+++ b/fukayo.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron24
-_ASAR="/opt/fukayo/fukayo.asar"
+APPDIR="/usr/lib/fukayo"
+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