fix errors

3 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a31846ebd449..1dfd9f644bfb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rekordfix-bin
 	pkgdesc = GUI tool for missing functionality to manage a Rekordbox collection
 	pkgver = 0.15.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/rzuppur/rekordfix
 	arch = x86_64
 	license = MIT
@@ -14,6 +14,6 @@ pkgbase = rekordfix-bin
 	source = rekordfix.sh
 	sha256sums = 4a6ef8fe7dcfb208bbee5c2f5bcbf3711967fd01872dc0ace70d3b68650f876b
 	sha256sums = ac76bfd52440815cb3e8ec5ea00f1f9b82c9b404219814f2f05c3fe44a9446c5
-	sha256sums = caf1a590ca8b38d86696d5cc687e098e88555a2ff77e3e374791ce1f1c7df7c4
+	sha256sums = 5354880d20f43a2144f4d291b13f8e3c43dffdefaaaa131ec2e66b573cfaf096
 
 pkgname = rekordfix-bin
diff --git a/PKGBUILD b/PKGBUILD
index 3b5f4174ef95..0a04650b8bd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,33 @@
 pkgname=rekordfix-bin
 _pkgname=Rekordfix
 pkgver=0.15.0
-pkgrel=3
+pkgrel=4
 pkgdesc="GUI tool for missing functionality to manage a Rekordbox collection"
 arch=('x86_64')
 url="https://github.com/rzuppur/rekordfix"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron25')
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+depends=(
+   'bash'
+   'electron25'
+)
+source=(
+   "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
    "LICENSE::https://raw.githubusercontent.com/rzuppur/rekordfix/v${pkgver}/LICENSE"
-   "${pkgname%-bin}.sh")
+   "${pkgname%-bin}.sh"
+)
 sha256sums=('4a6ef8fe7dcfb208bbee5c2f5bcbf3711967fd01872dc0ace70d3b68650f876b'
             'ac76bfd52440815cb3e8ec5ea00f1f9b82c9b404219814f2f05c3fe44a9446c5'
-            'caf1a590ca8b38d86696d5cc687e098e88555a2ff77e3e374791ce1f1c7df7c4')
-prepare() {
+            '5354880d20f43a2144f4d291b13f8e3c43dffdefaaaa131ec2e66b573cfaf096')
+build() {
    bsdtar -xf "${srcdir}/data.tar.xz"
    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}/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/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-   install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file
diff --git a/rekordfix.sh b/rekordfix.sh
index f69bfb24f739..0bb2c5824662 100644
--- a/rekordfix.sh
+++ b/rekordfix.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron25
-_ASAR="/opt/rekordfix/rekordfix.asar"
+APPDIR="/usr/lib/rekordfix"
+export PATH="${APPDIR}:${PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else