fix errors

3 files changed, 9 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 057ec5df4cd7..afcbd5dadbc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
 pkgbase = tenpi-music-player-bin
 	pkgdesc = A music player with real-time pitch shifting, time stretching, and reversing effects.
 	pkgver = 0.2.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://musicplayer.moe/
 	arch = x86_64
 	license = GPL-3.0-only
-	makedepends = squashfuse
-	makedepends = asar
+	makedepends = fuse2
 	depends = electron28
-	depends = dbus-glib
-	depends = libdbusmenu-glib
-	depends = gtk2
 	depends = nodejs
 	provides = tenpi-music-player=0.2.4
 	conflicts = tenpi-music-player
 	source = tenpi-music-player-0.2.4.AppImage::https://github.com/Tenpi/Music-Player/releases/download/v0.2.4/Music-Player-0.2.4.AppImage
 	source = tenpi-music-player.sh
 	sha256sums = f37e4b3ff235b203b6a43444a9d8e9d602a41d91dd3495b5aa1ea0ee29742ce4
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
 
 pkgname = tenpi-music-player-bin
diff --git a/PKGBUILD b/PKGBUILD
index cdcd1fb864e1..cb72e942726e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname="tenpi-${_appname}-bin"
 _pkgname=Music-Player
 pkgver=0.2.4
 _electronversion=28
-pkgrel=1
+pkgrel=2
 pkgdesc="A music player with real-time pitch shifting, time stretching, and reversing effects."
 arch=('x86_64')
 url="https://musicplayer.moe/"
@@ -14,21 +14,17 @@ provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     "electron${_electronversion}"
-    'dbus-glib'
-    'libdbusmenu-glib'
-    'gtk2'
     'nodejs'
 )
 makedepends=(
-    'squashfuse'
-    'asar'
+    'fuse2'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('f37e4b3ff235b203b6a43444a9d8e9d602a41d91dd3495b5aa1ea0ee29742ce4'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|g" \
         -e "s|@appname@|${pkgname%-bin}|g" \
@@ -37,15 +33,11 @@ build() {
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|Audio|AudioVideo|g" -i "${srcdir}/squashfs-root/${_appname}.desktop"
-    asar e "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cp "${srcdir}/squashfs-root/resources/app-update.yml" "${srcdir}/app.asar.unpacked/dev-app-update.yml"
-    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked/"* "${srcdir}/app.asar.unpacked"
-    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
     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}/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${_appname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
diff --git a/tenpi-music-player.sh b/tenpi-music-player.sh
index f9ced1432cfc..86cb3dc6a9bf 100644
--- a/tenpi-music-player.sh
+++ b/tenpi-music-player.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
 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