fix errors

3 files changed, 33 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a8b7d9e5af3..81c6ba87e7f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,17 @@
 pkgbase = apple-music-electron-bin
 	pkgdesc = A free, lightweight, open source alternative to iTunes and other Apple Music applications based on Electron 15
 	pkgver = 3.1.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Alex313031/Apple-Music-Electron
 	arch = x86_64
 	license = MIT
-	depends = bash
 	depends = electron15
 	depends = hicolor-icon-theme
+	depends = java-runtime
+	depends = lib32-glibc
+	depends = lib32-alsa-lib
+	depends = portaudio
+	depends = alsa-lib
 	optdepends = libnotify: Playback notifications
 	optdepends = otf-san-francisco: Use of SF Font for certain themes
 	provides = apple-music-electron=3.1.1
@@ -17,6 +21,6 @@ pkgbase = apple-music-electron-bin
 	source = apple-music-electron.sh
 	sha256sums = 7bf6157f871af6f3dee522ffbdb846c88689c2c87a542bdbe12898e1dfd280b8
 	sha256sums = 0fd63c3d94a7db5724728de22068188d45aa0c6be04c6e4c4c5983b5d46d5eee
-	sha256sums = 44dc6173c7bb88874ac68a31aaacc0bfb422a8fcd218d54cc124ebf36a5c5e72
+	sha256sums = 7ad83e25812c58c83f9fdcdeabaf49a09d6f7172fc085c2d60da79e6b12182d2
 
 pkgname = apple-music-electron-bin
diff --git a/PKGBUILD b/PKGBUILD
index be79410bd8d8..11a04d31717e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,33 +4,42 @@
 pkgname=apple-music-electron-bin
 _pkgname="Apple Music"
 pkgver=3.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free, lightweight, open source alternative to iTunes and other Apple Music applications based on Electron 15"
 arch=('x86_64')
 url="https://github.com/Alex313031/Apple-Music-Electron"
 license=("MIT")
-depends=('bash' 'electron15' 'hicolor-icon-theme')
-optdepends=('libnotify: Playback notifications'
-            'otf-san-francisco: Use of SF Font for certain themes')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-electron-bin}_${pkgver}_amd64.deb"
+depends=(
+    'electron15'
+    'hicolor-icon-theme'
+    'java-runtime'
+    'lib32-glibc'
+    'lib32-alsa-lib'
+    'portaudio'
+    'alsa-lib'
+)
+optdepends=(
+    'libnotify: Playback notifications'
+    'otf-san-francisco: Use of SF Font for certain themes'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-electron-bin}_${pkgver}_amd64.deb"
     "LICENSE::https://raw.githubusercontent.com/Alex313031/Apple-Music-Electron/v${pkgver}/LICENSE.md"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('7bf6157f871af6f3dee522ffbdb846c88689c2c87a542bdbe12898e1dfd280b8'
             '0fd63c3d94a7db5724728de22068188d45aa0c6be04c6e4c4c5983b5d46d5eee'
-            '44dc6173c7bb88874ac68a31aaacc0bfb422a8fcd218d54cc124ebf36a5c5e72')
-prepare() {
+            '7ad83e25812c58c83f9fdcdeabaf49a09d6f7172fc085c2d60da79e6b12182d2')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    asar e "${srcdir}/opt/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked"
-    cp -r "${srcdir}/opt/${_pkgname}/resources/app.asar.unpacked" "${srcdir}"
-    asar p "${srcdir}/app.asar.unpacked" "${srcdir}/${pkgname%-bin}.asar"
     sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\" %U|${pkgname%-bin}|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" -t "${pkgdir}/opt/${pkgname%-bin}"
-    cp -r "${srcdir}/opt/${_pkgname}/resources/regedit" "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/"{app.asar.unpacked,regedit} "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 144x144 256x256;do
         install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
diff --git a/apple-music-electron.sh b/apple-music-electron.sh
index ab23efa30ba6..e74d06fd3269 100644
--- a/apple-music-electron.sh
+++ b/apple-music-electron.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron15
-_ASAR="/opt/apple-music-electron/app.asar"
+APPDIR="/usr/lib/apple-music-electron"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else