fix errors

3 files changed, 39 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fae379916c75..43aa99e7d273 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,22 @@
 pkgbase = electron-music-player
 	pkgdesc = A functional music player for FLAC, mp3, and m4a audio.
 	pkgver = 0.8.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/kevinfrei/EMP
 	arch = any
 	license = CC0-1.0
 	makedepends = yarn
 	makedepends = npm
 	makedepends = gendesk
-	depends = libxrandr
-	depends = mesa
-	depends = pango
-	depends = glibc
-	depends = libx11
-	depends = libxext
-	depends = libxdamage
-	depends = cairo
-	depends = gcc-libs
-	depends = gtk3
-	depends = libxfixes
-	depends = at-spi2-core
-	depends = glib2
-	depends = libxkbcommon
-	depends = alsa-lib
-	depends = nss
-	depends = libcups
+	makedepends = nodejs>=20.3.1
+	makedepends = asar
+	depends = bash
 	depends = hicolor-icon-theme
-	depends = dbus
-	depends = nspr
-	depends = expat
-	depends = libxcb
-	depends = libdrm
-	depends = libxcomposite
+	depends = electron25
 	conflicts = electron-music-player
 	source = electron-music-player-0.8.8.tar.gz::https://github.com/kevinfrei/EMP/archive/refs/tags/v0.8.8.tar.gz
+	source = electron-music-player.sh
 	sha256sums = f720b3a2d18a83b33462201ac545d60d736b62dbeabd1c6273ec6189bb3d6e5e
+	sha256sums = b0919bac8ece8b1a9fc23d6decf527f88998e94f26cbf45ff6119ac84f50f1bb
 
 pkgname = electron-music-player
diff --git a/PKGBUILD b/PKGBUILD
index 08f86b59346d..3fe79dc292fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,43 @@ pkgname=electron-music-player
 _appname=EMP
 _pkgname=emp
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A functional music player for FLAC, mp3, and m4a audio. "
 arch=("any")
 url="https://github.com/kevinfrei/EMP"
 license=("CC0-1.0")
 conflicts=("${pkgname%-bin}")
-depends=('libxrandr' 'mesa' 'pango' 'glibc' 'libx11' 'libxext' 'libxdamage' 'cairo' 'gcc-libs' 'gtk3' 'libxfixes' 'at-spi2-core' 'glib2' \
-    'libxkbcommon' 'alsa-lib' 'nss' 'libcups' 'hicolor-icon-theme' 'dbus' 'nspr' 'expat' 'libxcb' 'libdrm' 'libxcomposite')
-makedepends=('yarn' 'npm' 'gendesk')
-source=("${pkgname%-bin}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('f720b3a2d18a83b33462201ac545d60d736b62dbeabd1c6273ec6189bb3d6e5e')
+depends=('bash' 'hicolor-icon-theme' 'electron25')
+makedepends=('yarn' 'npm' 'gendesk' 'nodejs>=20.3.1' 'asar')
+source=("${pkgname%-bin}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+    "${pkgname}.sh")
+sha256sums=('f720b3a2d18a83b33462201ac545d60d736b62dbeabd1c6273ec6189bb3d6e5e'
+            'b0919bac8ece8b1a9fc23d6decf527f88998e94f26cbf45ff6119ac84f50f1bb')
+prepare() {
+    gendesk -q -f -n --categories "AudioVideo" --name "EMP: Electron Music Player" --exec "${_pkgname}"
+}
 build() {
     cd "${srcdir}/${_appname}-${pkgver}"
-    yarn install
+    if [ -d .git ];then
+        rm -rf .git
+        mkdir .git
+    else
+        mkdir .git
+    fi
     sed '9i\  "repository": "github:kevinfrei/EMP",' -i package.json
     sed "s|\"./\"|\"https://github.com/kevinfrei/EMP\"|g" -i package.json
+    yarn
     yarn run build
+    asar e "${srcdir}/${_appname}-${pkgver}/release/${pkgver}/linux-unpacked/resources/app.asar" "${srcdir}/app.asar.unpacked"
+    cp -r "${srcdir}/${_appname}-${pkgver}/release/${pkgver}/linux-unpacked/resources/app.asar.unpacked" "${srcdir}"
+    cp -r "${srcdir}/${_appname}-${pkgver}/public" "${srcdir}/app.asar.unpacked"
+    echo "process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';" >> "${srcdir}/app.asar.unpacked/dist-electron/main.js"
+    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/opt/${pkgname}"
-    cp -r "${srcdir}/${_appname}-${pkgver}/release/${pkgver}/linux-unpacked/"* "${pkgdir}/opt/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
     install -Dm644 "${srcdir}/${_appname}-${pkgver}/dist/logo.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-    gendesk -f -n --icon "${pkgname}" --categories "AudioVideo" --name "EMP: Electron Music Player" --exec "/opt/${pkgname}/${_pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${_appname}-${pkgver}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/electron-music-player.sh b/electron-music-player.sh
new file mode 100644
index 000000000000..3ccd50a6b0f7
--- /dev/null
+++ b/electron-music-player.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+_ELECTRON=/usr/bin/electron25
+_ASAR="/opt/electron-music-player/resources/app.asar"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+fi
\ No newline at end of file