fix errors

3 files changed, 20 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fd7b6c2b518..9af3b0dc8f73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = somafm-desktop-player-bin
 	pkgdesc = SomaFM desktop player built with Electron and React
 	pkgver = 0.0.24
-	pkgrel = 1
+	pkgrel = 2
 	url = https://alechko.github.io/somafm-desktop-player/
 	arch = x86_64
 	license = MIT
@@ -11,10 +11,10 @@ pkgbase = somafm-desktop-player-bin
 	provides = somafm-desktop-player=0.0.24
 	conflicts = somafm-desktop-player
 	source = somafm-desktop-player-0.0.24.deb::https://github.com/alechko/somafm-desktop-player/releases/download/v0.0.24/somafm-desktop-player_0.0.24_amd64.deb
-	source = LICENSE::https://raw.githubusercontent.com/alechko/somafm-desktop-player/main/LICENSE.md
+	source = LICENSE::https://raw.githubusercontent.com/alechko/somafm-desktop-player/v0.0.24/LICENSE.md
 	source = somafm-desktop-player.sh
 	sha256sums = e5790fbe31508202725c3580466baad18cd90ac9c032f8c73ae63e10024fa8f7
 	sha256sums = 5e404eae8a20b20c3e2ab7e0a08d04012d2cf8d5bf266849a22d7aa810409381
-	sha256sums = d880eaabdd5678a4421e8c4165f774c6d4472c83af49e815fc248381dfb29efd
+	sha256sums = 1310bd669812eb2debd5ee9923b528aa87f1ef54f1f4b45bec60da01f520e18b
 
 pkgname = somafm-desktop-player-bin
diff --git a/PKGBUILD b/PKGBUILD
index 4988c18a7812..c749f552a392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=somafm-desktop-player-bin
 pkgver=0.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="SomaFM desktop player built with Electron and React"
 arch=("x86_64")
 url="https://alechko.github.io/somafm-desktop-player/"
@@ -12,20 +12,22 @@ conflicts=("${pkgname%-bin}")
 depends=('bash' 'electron16')
 makedepends=('asar')
 source=("${pkgname%-bin}-${pkgver}.deb::${_githuburl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
-    "LICENSE::https://raw.githubusercontent.com/alechko/somafm-desktop-player/main/LICENSE.md"
+    "LICENSE::https://raw.githubusercontent.com/alechko/somafm-desktop-player/v${pkgver}/LICENSE.md"
     "${pkgname%-bin}.sh")
 sha256sums=('e5790fbe31508202725c3580466baad18cd90ac9c032f8c73ae63e10024fa8f7'
             '5e404eae8a20b20c3e2ab7e0a08d04012d2cf8d5bf266849a22d7aa810409381'
-            'd880eaabdd5678a4421e8c4165f774c6d4472c83af49e815fc248381dfb29efd')
-prepare() {
+            '1310bd669812eb2debd5ee9923b528aa87f1ef54f1f4b45bec60da01f520e18b')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    asar pack "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${srcdir}/${pkgname%-bin}.asar"
+    asar pack "${srcdir}/usr/lib/${pkgname%-bin}/resources/app" "${srcdir}/app.asar"
+    sed "s| %U||g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
-    cp -r "${srcdir}/usr/lib/${pkgname%-bin}/resources/assets" "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/resources/assets/icon.png" -t "${pkgdir}/opt/${pkgname%-bin}/resources/assets"
+    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/swiftshader/"* -t "${pkgdir}/opt/${pkgname%-bin}/swiftshader"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/resources/assets/icon.png"  "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/somafm-desktop-player.sh b/somafm-desktop-player.sh
index a3b73d9a1958..154f798ee76c 100644
--- a/somafm-desktop-player.sh
+++ b/somafm-desktop-player.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron16
-_ASAR="/opt/somafm-desktop-player/somafm-desktop-player.asar"
+APPDIR="/opt/somafm-desktop-player"
+export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
+export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
+export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
+export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
+_ASAR="${APPDIR}/resources/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else