fixes desktop and adjusts special variable usage

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7dc762e145d..8966ecf56638 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = defi-app-bin
 	provides = defi-app
 	conflicts = defi-app
 	options = !strip
-	source = ::https://github.com/DeFiCh/app/releases/download/v2.1.17/
+	source = defi-app-2.1.17.AppImage::https://github.com/DeFiCh/app/releases/download/v2.1.17/defi-app-2.1.17.AppImage
 	sha512sums = e042a6fae936cbd4f92ea2e5b893a5d20f432c96c2b6adf5ee790af7cb22cdd63f92a937b40f4955349df95aeb8df3e2af84b73084dd380a71bfedad9979945f
 
 pkgname = defi-app-bin
diff --git a/PKGBUILD b/PKGBUILD
index 3ad5b69951ff..d1cb8b450d5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,31 +13,34 @@ options=(!strip)
 provides=('defi-app')
 conflicts=('defi-app')
 source=(
-  "${package}::${url}/releases/download/v${pkgver}/${package}"
+  "${_package}::${url}/releases/download/v${pkgver}/${_package}"
 )
 sha512sums=('e042a6fae936cbd4f92ea2e5b893a5d20f432c96c2b6adf5ee790af7cb22cdd63f92a937b40f4955349df95aeb8df3e2af84b73084dd380a71bfedad9979945f'
 )
 
 build() {
 	# Extract files
-	chmod +x "$srcdir/$package"
-	$srcdir/$package --appimage-extract
+	chmod +x "$srcdir/$_package"
+	$srcdir/$_package --appimage-extract
+
+        # Correct .desktop
+	sed -e "s/AppRun/${pkgbin}/g" -i "$srcdir/squashfs-root/$pkgbin.desktop"
 }
 
 
 package() {
-	install -d "$pkgdir/opt/$pkgbin"
-	cp -a "$srcdir/squashfs-root/." "$pkgdir/opt/$pkgbin/"
-	chmod -R +rx "$pkgdir/opt/$pkgbin"
+	install -d "$pkgdir/opt/$__pkgbin"
+	cp -a "$srcdir/squashfs-root/." "$pkgdir/opt/$_pkgbin/"
+	chmod -R +rx "$pkgdir/opt/$_pkgbin"
 
 	install -d "$pkgdir/usr/bin"
-	ln -s "/opt/$pkgbin/$pkgbin" "$pkgdir/usr/bin/$pkgbin"
+	ln -s "/opt/$_pkgbin/$_pkgbin" "$pkgdir/usr/bin/$_pkgbin"
 
 	install -d "$pkgdir/usr/share"
 	cp -r "$srcdir/squashfs-root/usr/share/." "${pkgdir}/usr/share/"
 
 	find "$pkgdir" -type d -exec chmod 755 {} +
 
-	install -Dm644 "$srcdir/squashfs-root/$pkgbin.desktop" "$pkgdir/usr/share/applications/$pkgbin.desktop"
+	install -Dm644 "$srcdir/squashfs-root/$_pkgbin.desktop" "$pkgdir/usr/share/applications/$_pkgbin.desktop"
 }