Fix icons, move symlink generation to PKGBUILD

3 files changed, 8 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0fc19b020b1..ba11cdcc1d4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = bloomrpc
-	pkgdesc = GUI Client for GRPC Services
+	pkgdesc = GUI Client for gRPC Services
 	pkgver = 1.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/uw-labs/bloomrpc
-	install = bloomrpc.install
 	arch = any
 	license = LGPL3
 	makedepends = nodejs
diff --git a/PKGBUILD b/PKGBUILD
index eb0eae00a362..3de65a66fd73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Denis Lobanov <denis dot lobanov at zooei dot com>
 pkgname=bloomrpc
 pkgver=1.3.1
-pkgrel=1
-pkgdesc="GUI Client for GRPC Services"
+pkgrel=2
+pkgdesc="GUI Client for gRPC Services"
 arch=(any)
 url="https://github.com/uw-labs/bloomrpc"
 license=(LGPL3)
 depends=('gtk3' 'gconf' 'libxss' 'libxtst')
 makedepends=('nodejs' 'npm'  'clang' 'git' 'yarn')
-install=${pkgname}.install
 source=("${pkgname}::git+https://github.com/uw-labs/bloomrpc.git#tag=${pkgver//_/-}"
         "${pkgname}.desktop")
 sha1sums=('SKIP'
@@ -38,10 +37,12 @@ package() {
   cd resources/icons
   for i in $(ls *.png)
   do 
-    mkdir -p "$pkgdir/usr/share/icons/hicolor/${i%.png}"
-    install -Dm644  $i "$pkgdir/usr/share/icons/hicolor/${i%.png}/"
+    mkdir -p "$pkgdir/usr/share/icons/hicolor/${i%.png}/apps/"
+    install -Dm644  $i "$pkgdir/usr/share/icons/hicolor/${i%.png}/apps/bloomrpc.png"
   done
 
+  mkdir -p $pkgdir/usr/local/bin
+  ln -sf /opt/BloomRPC/bloomrpc $pkgdir/usr/local/bin/bloomrpc
   install -Dm644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop
 }
 
diff --git a/bloomrpc.install b/bloomrpc.install
deleted file mode 100644
index 9a83d347dcc4..000000000000
--- a/bloomrpc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    :
-#!/bin/bash
-
-# Link to the binary
-ln -sf '/opt/BloomRPC/bloomrpc' '/usr/local/bin/bloomrpc'
-
-}
-post_remove() {
-    :
-#!/bin/bash
-
-# Delete the link to the binary
-rm -f '/usr/local/bin/bloomrpc'
-
-}