fix errors

3 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71f5b825b5ca..1d04c76f9df4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = swifty-bin
 	pkgdesc = Free Offline-first Password Manager for MacOS, Windows and Linux.
 	pkgver = 0.6.13
-	pkgrel = 5
+	pkgrel = 6
 	url = https://getswifty.pro/
 	arch = x86_64
 	license = GPL3
@@ -12,6 +12,6 @@ pkgbase = swifty-bin
 	source = swifty-0.6.13_amd64.deb::https://github.com/swiftyapp/swifty/releases/download/v0.6.13/Swifty_0.6.13_amd64.deb
 	source = swifty.sh
 	sha256sums = daa037c75ebc4e6a7b0b835f0efef2d5b1fa7bf4c2c728badbeb16d5f61a3b6a
-	sha256sums = c629348eda1126c30f6f9542ebee160c328981b6b9e7d4d091627f92ee1f10b4
+	sha256sums = 4049c6f8152e52f2bda29e4e391a4b9dbee2aa54c51e13b2b47a0ec96cb728d8
 
 pkgname = swifty-bin
diff --git a/PKGBUILD b/PKGBUILD
index 55e561a967f8..76f410b0fcb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=swifty-bin
 _pkgname=Swifty
 pkgver=0.6.13
-pkgrel=5
+pkgrel=6
 pkgdesc="Free Offline-first Password Manager for MacOS, Windows and Linux."
 arch=("x86_64")
 url="https://getswifty.pro/"
@@ -10,18 +10,23 @@ _githuburl="https://github.com/swiftyapp/swifty"
 license=('GPL3')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron23')
-source=("${pkgname%-bin}-${pkgver}_amd64.deb::${_githuburl}/releases/download/v${pkgver}/${_pkgname}_${pkgver}_amd64.deb"
-    "${pkgname%-bin}.sh")
+depends=(
+    'bash'
+    'electron23'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}_amd64.deb::${_githuburl}/releases/download/v${pkgver}/${_pkgname}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('daa037c75ebc4e6a7b0b835f0efef2d5b1fa7bf4c2c728badbeb16d5f61a3b6a'
-            'c629348eda1126c30f6f9542ebee160c328981b6b9e7d4d091627f92ee1f10b4')
-prepare() {
+            '4049c6f8152e52f2bda29e4e391a4b9dbee2aa54c51e13b2b47a0ec96cb728d8')
+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/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/usr/share/mime/packages/${pkgname%-bin}.xml" -t "${pkgdir}/usr/share/mime/packages"
diff --git a/swifty.sh b/swifty.sh
index 1c027f940244..baefee79971d 100644
--- a/swifty.sh
+++ b/swifty.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron23
-_ASAR="/opt/swifty/swifty.asar"
+APPDIR=/usr/lib/swifty
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else