Generate desktop entry using gendesk

3 files changed, 8 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e645161dd04..ed6afa79e5bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = rider
 	pkgdesc = A cross-platform .NET IDE by JetBrains.
 	pkgver = 2023.1.2
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 1
 	url = https://www.jetbrains.com/rider/
 	arch = x86_64
 	arch = aarch64
 	license = Commercial
+	makedepends = gendesk
 	optdepends = mono: .NET runtime
 	optdepends = msbuild: build .NET Core projects
 	provides = rider
@@ -14,8 +15,6 @@ pkgbase = rider
 	options = !strip
 	options = staticlibs
 	source = https://download-cf.jetbrains.com/rider/JetBrains.Rider-2023.1.2.tar.gz
-	source = rider.desktop
 	sha256sums = 50eb2deb303162dc77c802c4402c2734bdae38a47ab534921e064a107dc284ae
-	sha256sums = 3709aa3f918294ecc7d9ad483ee549f45a746248ec6397d297cfac023f999229
 
 pkgname = rider
diff --git a/PKGBUILD b/PKGBUILD
index c2a9c1ae101f..b1c12ee86b80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 
 pkgname=rider
 pkgver='2023.1.2'
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='A cross-platform .NET IDE by JetBrains.'
 arch=('x86_64' 'aarch64')
 options=('!strip' 'staticlibs')
 url='https://www.jetbrains.com/rider/'
 license=('Commercial')
+makedepends=('gendesk')
 optdepends=('mono: .NET runtime' 'msbuild: build .NET Core projects')
 provides=('rider')
 conflicts=('rider')
@@ -16,10 +17,8 @@ conflicts=('rider')
 _installdir='/usr/share'
 _pkgdir="JetBrains Rider-${pkgver}"
 _srcfile="JetBrains.Rider-${pkgver}.tar.gz"
-source=("https://download-cf.jetbrains.com/rider/${_srcfile}"
-        'rider.desktop')
-sha256sums=('50eb2deb303162dc77c802c4402c2734bdae38a47ab534921e064a107dc284ae'
-            '3709aa3f918294ecc7d9ad483ee549f45a746248ec6397d297cfac023f999229')
+source=("https://download-cf.jetbrains.com/rider/${_srcfile}")
+sha256sums=('50eb2deb303162dc77c802c4402c2734bdae38a47ab534921e064a107dc284ae')
 
 package() {
     cd "${srcdir}"
@@ -32,8 +31,7 @@ package() {
     ln -s "${_installdir}/${pkgname}"/bin/rider.sh "${pkgdir}"/usr/bin/"${pkgname}"
 
     install -d -m755 "$pkgdir"/usr/share/applications
-    sed -i "s#Version=#Version=${pkgver}#g" "${pkgname}.desktop"
-    sed -i "s#Exec=#Exec=\"${_installdir}/${pkgname}/bin/rider.sh\" %f#g" "${pkgname}.desktop"
-    sed -i "s/Comment=/Comment=${pkgdesc}/g" "${pkgname}.desktop"
+    gendesk -f -n --exec "${_installdir}/${pkgname}/bin/rider.sh %f" --icon "${_installdir}/${pkgname}/bin/rider.png"
+    echo "StartupWMClass=jetbrains-rider" >> "${pkgname}.desktop"
     install -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications"
 }
diff --git a/rider.desktop b/rider.desktop
deleted file mode 100644
index 30ddce1a654c..000000000000
--- a/rider.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.4
-Type=Application
-Name=Rider
-Icon=/usr/share/rider/bin/rider.png
-Exec="/usr/share/rider/bin/rider.sh" %f
-Comment=A cross-platform .NET IDE by JetBrains
-Categories=Development;IDE;
-Terminal=false
-StartupWMClass=jetbrains-rider