use the desktop file & icons from tar.xz (now these are included)

7 files changed, 9 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48289667df95..2bef9f0d0bd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ioninja
 	pkgdesc = Professional, scriptable, all-in-one terminal/sniffer
 	pkgver = 3.14.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ioninja.com
 	arch = i686
 	arch = x86_64
@@ -9,16 +9,6 @@ pkgbase = ioninja
 	depends = qt5-base
 	depends = openssl
 	options = !strip
-	source = ioninja-16x16.png
-	source = ioninja-32x32.png
-	source = ioninja-48x48.png
-	source = ioninja-64x64.png
-	source = ioninja-256x256.png
-	sha256sums = 448660bfad8a4ef0be277d851df31adbe0ac04e1a3fe1bf47e6970401e1cfb98
-	sha256sums = ffbc8076d346fc1b05cd257e90137ec938de39a0e36b100cf164e2f2810c5f87
-	sha256sums = fdb37e8ee814eefeb5162c4a9fa026778854d7ec5b93d9bf3c5bed10504f0c97
-	sha256sums = 47bfac3143d5486a3abc433bd33c6a1300505213812e3196a2419fa832e1fb77
-	sha256sums = 6bb9a201534c99e475823b0aacc7114815fcb199ae2ddf0d359d5fd2d9af8b9c
 	source_i686 = https://tibbo.com/downloads/archive/ioninja/ioninja-3.14.1/ioninja-3.14.1-linux-x86.tar.xz
 	sha256sums_i686 = 64e4aed73ca2b87c22120b29ad8acbc189af072c608853c4c417f23a9b25363f
 	source_x86_64 = https://tibbo.com/downloads/archive/ioninja/ioninja-3.14.1/ioninja-3.14.1-linux-amd64.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 7972f1824e14..932525237dbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,18 @@
 
 pkgname=ioninja
 pkgver=3.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Professional, scriptable, all-in-one terminal/sniffer"
 arch=("i686" "x86_64")
 url="https://ioninja.com"
 license=("custom")
 depends=("qt5-base" "openssl")
 options=("!strip")
-source=(
-	"ioninja-16x16.png"
-	"ioninja-32x32.png"
-	"ioninja-48x48.png"
-	"ioninja-64x64.png"
-	"ioninja-256x256.png"
-	)
 source_i686=("https://tibbo.com/downloads/archive/ioninja/ioninja-$pkgver/ioninja-$pkgver-linux-x86.tar.xz")
 source_x86_64=("https://tibbo.com/downloads/archive/ioninja/ioninja-$pkgver/ioninja-$pkgver-linux-amd64.tar.xz")
-sha256sums=(
-	"448660bfad8a4ef0be277d851df31adbe0ac04e1a3fe1bf47e6970401e1cfb98"  # ioninja-16x16.png
-	"ffbc8076d346fc1b05cd257e90137ec938de39a0e36b100cf164e2f2810c5f87"  # ioninja-32x32.png
-	"fdb37e8ee814eefeb5162c4a9fa026778854d7ec5b93d9bf3c5bed10504f0c97"  # ioninja-48x48.png
-	"47bfac3143d5486a3abc433bd33c6a1300505213812e3196a2419fa832e1fb77"  # ioninja-64x64.png
-	"6bb9a201534c99e475823b0aacc7114815fcb199ae2ddf0d359d5fd2d9af8b9c"  # ioninja-256x256.png
-	)
 sha256sums_i686=("64e4aed73ca2b87c22120b29ad8acbc189af072c608853c4c417f23a9b25363f")
 sha256sums_x86_64=("0bfa2190dcde9ba554a1324d2c436a8a81dead2caae7bd21ea7bd51f8da97bf0")
 
-prepare() {
-	gendesk -f --name="IO Ninja" --pkgname="$pkgname" --pkgdesc="$pkgdesc" --categories="Network;Utility;Development" PKGBUILD
-}
-
 package() {
 	if [ "$CARCH" == "x86_64" ]; then
 		NJ_ARCH=amd64
@@ -45,15 +27,13 @@ package() {
 	install -d "$pkgdir"/usr/lib
 	install -d "$pkgdir"/usr/etc/ioninja
 	install -d "$pkgdir"/usr/share/ioninja
+	install -d "$pkgdir"/usr/share/applications
+	install -d "$pkgdir"/usr/share/icons
 
-	cp $NJ_DIR/bin/* "$pkgdir"/usr/bin/
+	cp    $NJ_DIR/bin/* "$pkgdir"/usr/bin/
 	cp -P $NJ_DIR/lib/* "$pkgdir"/usr/lib/
-	cp -rf $NJ_DIR/etc/ioninja/* "$pkgdir"/usr/etc/ioninja/
-	cp -rf $NJ_DIR/share/ioninja/* "$pkgdir"/usr/share/ioninja/
-
-	install -Dm644 ioninja.desktop "$pkgdir"/usr/share/applications/ioninja.desktop
-
-	for iconsize in 16x16 32x32 48x48 64x64 256x256; do
-		install -Dm644 ioninja-$iconsize.png "$pkgdir"/usr/share/icons/hicolor/$iconsize/apps/ioninja.png
-	done
+	cp -r $NJ_DIR/etc/ioninja/* "$pkgdir"/usr/etc/ioninja/
+	cp -r $NJ_DIR/share/ioninja/* "$pkgdir"/usr/share/ioninja/
+	cp    $NJ_DIR/share/applications/* "$pkgdir"/usr/share/applications/
+	cp -r $NJ_DIR/share/icons/* "$pkgdir"/usr/share/icons/
 }
diff --git a/ioninja-16x16.png b/ioninja-16x16.png
deleted file mode 100644
index 8133656d2e4b..000000000000
--- a/ioninja-16x16.png
+++ /dev/null
diff --git a/ioninja-256x256.png b/ioninja-256x256.png
deleted file mode 100644
index b7deb38564cb..000000000000
--- a/ioninja-256x256.png
+++ /dev/null
diff --git a/ioninja-32x32.png b/ioninja-32x32.png
deleted file mode 100644
index cc42dfd58c17..000000000000
--- a/ioninja-32x32.png
+++ /dev/null
diff --git a/ioninja-48x48.png b/ioninja-48x48.png
deleted file mode 100644
index a85346b80f75..000000000000
--- a/ioninja-48x48.png
+++ /dev/null
diff --git a/ioninja-64x64.png b/ioninja-64x64.png
deleted file mode 100644
index dcd5143a2a55..000000000000
--- a/ioninja-64x64.png
+++ /dev/null