fix errors

3 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2357efb32211..d71324fcec89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = ferrum-bin
 	pkgdesc = Music library app for Mac, Linux and Windows
 	pkgver = 0.17.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/probablykasper/ferrum
 	arch = x86_64
 	license = custom
-	depends = bash
 	depends = electron19
 	depends = hicolor-icon-theme
 	provides = ferrum=0.17.1
@@ -13,6 +12,6 @@ pkgbase = ferrum-bin
 	source = ferrum-0.17.1.deb::https://github.com/probablykasper/ferrum/releases/download/v0.17.1/Ferrum-v0.17.1-linux.deb
 	source = ferrum.sh
 	sha256sums = 42a0c42c3d24d50ff90fc30a8036023c2721697f855b1a6b02209dfd8602807e
-	sha256sums = 82c1ab76cad4489dfdae40b0948c81dc5cb421849d50e356f8caadf70df16f67
+	sha256sums = 51c96590631edbdcc6bf5a1bc19ed248c63af8c6018aebe3764d2cad97af50fd
 
 pkgname = ferrum-bin
diff --git a/PKGBUILD b/PKGBUILD
index 707ba6f1c0a7..457f7d2269e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,31 @@
 pkgname=ferrum-bin
 _pkgname=Ferrum
 pkgver=0.17.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Music library app for Mac, Linux and Windows"
 arch=('x86_64')
 url="https://github.com/probablykasper/ferrum"
 license=('custom')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron19' 'hicolor-icon-theme')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-linux.deb"
-    "${pkgname%-bin}.sh")
+depends=(
+    'electron19'
+    'hicolor-icon-theme'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-linux.deb"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('42a0c42c3d24d50ff90fc30a8036023c2721697f855b1a6b02209dfd8602807e'
-            '82c1ab76cad4489dfdae40b0948c81dc5cb421849d50e356f8caadf70df16f67')
-prepare() {
+            '51c96590631edbdcc6bf5a1bc19ed248c63af8c6018aebe3764d2cad97af50fd')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin}|g;s|Audio|AudioVideo|g" \
         -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/opt/${_pkgname}/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
     for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
diff --git a/ferrum.sh b/ferrum.sh
index c3e960ecde51..e97003991e0f 100644
--- a/ferrum.sh
+++ b/ferrum.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron19
-_ASAR="/opt/ferrum/ferrum.asar"
+APPDIR="/usr/lib/ferrum"
+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