Add icon, desktop shortcut and fix indent

2 files changed, 40 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a0dafb96f6c..a7bc84b84b6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = asciidocfx
 	pkgdesc = Asciidoc Editor and Toolchain written with JavaFX 8
-	pkgver = 1.5.0
+	pkgver = 1.5.5
 	pkgrel = 1
 	url = http://asciidocfx.com/
 	arch = any
 	license = Apache
 	makedepends = maven>=3.3.9
 	makedepends = java-environment-openjdk=8
+	makedepends = gendesk
 	depends = java-environment=8
 	depends = java-openjfx>=8.u76
-	source = https://github.com/asciidocfx/AsciidocFX/archive/v1.5.0.tar.gz
+	source = https://github.com/asciidocfx/AsciidocFX/archive/v1.5.5.tar.gz
+	source = https://cdn.rawgit.com/asciidocfx/AsciidocFX/ea3c14d4b2d03ce94b93b7dce0985c5c5bbc4206/src/main/resources/logo.png
 	source = asciidocfx
-	sha256sums = 8e31e7f8ca9fb40045273557089dd3580097bc99fea8904b6d471d12865f8c0e
-	sha256sums = a7b4491ff8d379519c5085b9779c613695c2be941f3473422d69cefbdb9d3d95
+	sha512sums = 26d6e0255d47327fa6323f09abddfd0e237d75a1339672ec907c36bb2c2305a8a963d218da10a4b38e1aaf740188ad97c5142c7dcf6524c0e9aae90692c46717
+	sha512sums = 71e7a0598000a0574b9edbfddf70d9c4ab2c6930aadc8e6256fc4d18ded0757e0ab9f2411da8b26a5ecff1505c6e0ece0ee9b80a73a4c130ccba45331a112fac
+	sha512sums = 338ee0d004724d5eef8cd44fe7f6d89bb4d48b37143240d4d65258ab4c571f9e931821d9bf52a64c87b6e83165bb9c571541bc4142c73485bcdcc105de0f1ea7
 
 pkgname = asciidocfx
 
diff --git a/PKGBUILD b/PKGBUILD
index 03bb9b84b2b5..38ac4e221b14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: William Gathoye <william + aur at gathoye dot be>
-# Contributor: Corey Richardson <corey@octayn.net>
+# Maintainer: Corey Richardson <corey at octayn dot net>
 
 pkgname=asciidocfx
 pkgver=1.5.5
@@ -10,28 +10,49 @@ arch=('any')
 url="http://asciidocfx.com/"
 license=('Apache')
 
-makedepends=('maven>=3.3.9' 'java-environment-openjdk=8')
+makedepends=('maven>=3.3.9' 'java-environment-openjdk=8' 'gendesk')
 depends=('java-environment=8' 'java-openjfx>=8.u76')
 
-source=("https://github.com/asciidocfx/AsciidocFX/archive/v$pkgver.tar.gz"
-        'asciidocfx')
+source=(
+    "https://github.com/asciidocfx/AsciidocFX/archive/v$pkgver.tar.gz"
+    'https://cdn.rawgit.com/asciidocfx/AsciidocFX/ea3c14d4b2d03ce94b93b7dce0985c5c5bbc4206/src/main/resources/logo.png'
+    'asciidocfx')
 sha512sums=(
 '26d6e0255d47327fa6323f09abddfd0e237d75a1339672ec907c36bb2c2305a8a963d218da10a4b38e1aaf740188ad97c5142c7dcf6524c0e9aae90692c46717'
+'71e7a0598000a0574b9edbfddf70d9c4ab2c6930aadc8e6256fc4d18ded0757e0ab9f2411da8b26a5ecff1505c6e0ece0ee9b80a73a4c130ccba45331a112fac'
 '338ee0d004724d5eef8cd44fe7f6d89bb4d48b37143240d4d65258ab4c571f9e931821d9bf52a64c87b6e83165bb9c571541bc4142c73485bcdcc105de0f1ea7'
 )
 
+prepare() {
+
+    # Generate a desktop entry
+    # -f: forces and overrides the file if any
+    # -n: do not download an icon
+    # This tool assumes the icon has the same name as pkgname.
+    # For categories see https://standards.freedesktop.org/menu-spec/latest/apa.html
+    gendesk -f -n \
+        --pkgname "$pkgname" \
+        --pkgdesc "$pkgdesc" \
+        --name "AsciidocFX" \
+        --exec "/usr/bin/asciidocfx" \
+        --categories "Development;Office;WordProcessor;TextTools;ComputerScience;Documentation;Java"
+}
+
 build() {
-  cd "AsciidocFX-$pkgver"
+    cd "AsciidocFX-$pkgver"
 
-  # "install" seemingly means "build and ready for installation"
-  mvn clean install
+    # "install" seemingly means "build and ready for installation"
+    mvn clean install
 }
 
 package() {
-  cd "AsciidocFX-$pkgver"
+    cd "AsciidocFX-$pkgver"
+
+    install -dm755 "$pkgdir/usr/share/java/asciidocfx"
+    install -dm755 "$pkgdir/usr/bin"
+    mv -t "$pkgdir/usr/share/java/asciidocfx" target/appassembler/{conf,lib}
+    install -m755 ../asciidocfx "$pkgdir/usr/bin/asciidocfx"
 
-  install -dm755 "$pkgdir/usr/share/java/asciidocfx"
-  install -dm755 "$pkgdir/usr/bin"
-  mv -t "$pkgdir/usr/share/java/asciidocfx" target/appassembler/{conf,lib}
-  install -m775 ../asciidocfx "$pkgdir/usr/bin/asciidocfx"
+    install -Dm644 ../$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "../logo.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }