fix errors

2 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c94950493615..0a8b7d9e5af3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,19 @@
 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 = 2
+	pkgrel = 3
 	url = https://github.com/Alex313031/Apple-Music-Electron
 	arch = x86_64
 	license = MIT
 	depends = bash
-	depends = gcc-libs
-	depends = alsa-lib
 	depends = electron15
-	depends = portaudio
 	depends = hicolor-icon-theme
-	depends = java-runtime
-	depends = lib32-glibc
-	depends = lib32-alsa-lib
-	depends = glibc
 	optdepends = libnotify: Playback notifications
 	optdepends = otf-san-francisco: Use of SF Font for certain themes
 	provides = apple-music-electron=3.1.1
 	conflicts = apple-music-electron
 	source = apple-music-electron-3.1.1.deb::https://github.com/Alex313031/Apple-Music-Electron/releases/download/v3.1.1/apple-music_3.1.1_amd64.deb
-	source = LICENSE::https://raw.githubusercontent.com/Alex313031/Apple-Music-Electron/master/LICENSE.md
+	source = LICENSE::https://raw.githubusercontent.com/Alex313031/Apple-Music-Electron/v3.1.1/LICENSE.md
 	source = apple-music-electron.sh
 	sha256sums = 7bf6157f871af6f3dee522ffbdb846c88689c2c87a542bdbe12898e1dfd280b8
 	sha256sums = 0fd63c3d94a7db5724728de22068188d45aa0c6be04c6e4c4c5983b5d46d5eee
diff --git a/PKGBUILD b/PKGBUILD
index 05b2fe5b2083..be79410bd8d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,28 +4,37 @@
 pkgname=apple-music-electron-bin
 _pkgname="Apple Music"
 pkgver=3.1.1
-pkgrel=2
+pkgrel=3
 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' 'gcc-libs' 'alsa-lib' 'electron15' 'portaudio' 'hicolor-icon-theme' 'java-runtime' 'lib32-glibc' 'lib32-alsa-lib' 'glibc')
+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"
-    "LICENSE::https://raw.githubusercontent.com/Alex313031/Apple-Music-Electron/master/LICENSE.md"
+    "LICENSE::https://raw.githubusercontent.com/Alex313031/Apple-Music-Electron/v${pkgver}/LICENSE.md"
     "${pkgname%-bin}.sh")
 sha256sums=('7bf6157f871af6f3dee522ffbdb846c88689c2c87a542bdbe12898e1dfd280b8'
             '0fd63c3d94a7db5724728de22068188d45aa0c6be04c6e4c4c5983b5d46d5eee'
             '44dc6173c7bb88874ac68a31aaacc0bfb422a8fcd218d54cc124ebf36a5c5e72')
-package(){
-	bsdtar -xf "${srcdir}/data.tar.xz"
-    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
-    cp -r "${srcdir}/opt/${_pkgname}/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
-    sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+prepare() {
+    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}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-    cp -r "${srcdir}/usr/share/icons" "${pkgdir}/usr/share"
+    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" \
+            -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
+    done
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file