Add icon to .desktop file

4 files changed, 13 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bca49239465f..0740d0c957fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ipmiview
 	pkgdesc = Supermicro IPMI tool
 	pkgver = 2.17.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.supermicro.com/products/nfo/ipmi.cfm
 	arch = x86_64
 	license = custom:"Super Micro Computer"
@@ -16,8 +16,10 @@ pkgbase = ipmiview
 	backup = opt/ipmiview/timeout.properties
 	source = https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz
 	source = ipmiview.desktop
+	source = ipmiview.png
 	sha512sums = 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-	sha512sums = 683922d5ce90116ca04fbf1a244da87296beaf079ecde94d799b2d303e21dfda4e771f5a4b724e7dd64143feaef49d2f11fd2eaf380ebdcf02e9db82c9975497
+	sha512sums = 82f6d4a9f6ff031f0c7e7ab78a550ea76b8e297df62aaa9837a37fe4f0b4a8b4dfa4aae59c0edc9ee2f0b7e249548ba4f5f50a44e0682a7f7b6f098163a17879
+	sha512sums = d1fb8e68ca057e3b2bc1c6e51cda226443c729db5166363d637a536afc07aab285ba46f9da5f656837e2423685a0ae421789a4768acee5ac8185ecb04318fc81
 
 pkgname = ipmiview
 
diff --git a/PKGBUILD b/PKGBUILD
index 80e717990202..210a1f38c5b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=ipmiview
 pkgver=2.17.0
 _pkghash=200505
-pkgrel=3
+pkgrel=4
 pkgdesc="Supermicro IPMI tool"
 makedepends=('tar')
 depends=("glibc" "java-runtime=8")
@@ -21,24 +21,24 @@ backup=(
 source=(
     "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${pkgver}_build.${_pkghash}_bundleJRE_Linux_x64.tar.gz"
     'ipmiview.desktop'
+    'ipmiview.png'
     )
 
 sha512sums=(
     '17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091'
-    '683922d5ce90116ca04fbf1a244da87296beaf079ecde94d799b2d303e21dfda4e771f5a4b724e7dd64143feaef49d2f11fd2eaf380ebdcf02e9db82c9975497'
+    '82f6d4a9f6ff031f0c7e7ab78a550ea76b8e297df62aaa9837a37fe4f0b4a8b4dfa4aae59c0edc9ee2f0b7e249548ba4f5f50a44e0682a7f7b6f098163a17879'
+    'd1fb8e68ca057e3b2bc1c6e51cda226443c729db5166363d637a536afc07aab285ba46f9da5f656837e2423685a0ae421789a4768acee5ac8185ecb04318fc81'
     )
 
 package() {
-  cd ${srcdir}/IPMIView_${pkgver}_build.${_pkghash}_bundleJRE_Linux_x64
-
-  # Remove bundled jre
-  rm -rf jre/
-
   mkdir -p ${pkgdir}/opt/${pkgname}
   mkdir -p ${pkgdir}/usr/bin
   mkdir -p ${pkgdir}/usr/share/applications
 
+  pushd ${srcdir}/IPMIView_${pkgver}_build.${_pkghash}_bundleJRE_Linux_x64
+  rm -rf jre/ # Remove bundled jre
   cp -rf . ${pkgdir}/opt/${pkgname}
+  popd
 
   touch ${pkgdir}/opt/${pkgname}/account.properties
   chmod a+rw ${pkgdir}/opt/${pkgname}/account.properties
@@ -60,4 +60,5 @@ package() {
 
   ln -s /opt/${pkgname}/IPMIView20 ${pkgdir}/usr/bin/${pkgname}
   install -m 0644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
+  install -m 0644 "${srcdir}/${pkgname}.png" "${pkgdir}/opt/${pkgname}/"
 }
diff --git a/ipmiview.desktop b/ipmiview.desktop
index b5bbec549454..3d2b8a1aac2a 100644
--- a/ipmiview.desktop
+++ b/ipmiview.desktop
@@ -4,7 +4,7 @@ Comment=Supermicro tool for BMC
 Keywords=ipmi;supermicro;bmc;
 Path=/opt/ipmiview
 Exec=ipmiview
-Icon=
+Icon=/opt/ipmiview/ipmiview.png
 Terminal=false
 Type=Application
 Categories=Network;Configuration;
diff --git a/ipmiview.png b/ipmiview.png
new file mode 100644
index 000000000000..18497ec1da44
--- /dev/null
+++ b/ipmiview.png