Fix speedtest

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a2282691dfa..1161f864ce67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nutty-git
 	pkgdesc = A network utility that monitors the devices on your network, checks bandwidth and speed details.
-	pkgver = 1.1.1.r72.gde6a857
-	pkgrel = 1
+	pkgver = 1.1.1.r75.g8838eeb
+	pkgrel = 2
 	url = https://github.com/babluboy/nutty
 	install = nutty.install
 	arch = x86_64
@@ -11,18 +11,19 @@ pkgbase = nutty-git
 	makedepends = meson
 	makedepends = vala
 	depends = granite
+	depends = iproute2
+	depends = libgee
 	depends = libnotify
 	depends = libxml2
-	depends = libgee
-	depends = sqlite
 	depends = net-tools
 	depends = nethogs
 	depends = nmap
+	depends = pciutils
+	depends = speedtest-cli
+	depends = sqlite
 	depends = traceroute
 	depends = vnstat
 	depends = wireless_tools
-	depends = iproute2
-	depends = pciutils
 	provides = nutty
 	conflicts = nutty
 	source = git+https://github.com/babluboy/nutty.git
diff --git a/PKGBUILD b/PKGBUILD
index 03fe9244ead8..0af9c821150d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,16 @@
 # Contributor: Marcin Tydelski <marcin.tydelski@gmail.com>
 # Contributor: Siddhartha Das bablu.boy@gmail.com>
 pkgname=nutty-git
-pkgver=1.1.1.r72.gde6a857
-pkgrel=1
+_app_id=com.github.babluboy.nutty
+pkgver=1.1.1.r75.g8838eeb
+pkgrel=2
 pkgdesc='A network utility that monitors the devices on your network,
          checks bandwidth and speed details.'
 arch=('x86_64')
 url='https://github.com/babluboy/nutty'
 license=('GPL3')
-depends=('granite' 'libnotify' 'libxml2' 'libgee' 'sqlite' 'net-tools' 'nethogs'
-         'nmap' 'traceroute' 'vnstat' 'wireless_tools' 'iproute2' 'pciutils')
+depends=('granite' 'iproute2' 'libgee' 'libnotify' 'libxml2' 'net-tools' 'nethogs'
+         'nmap' 'pciutils' 'speedtest-cli' 'sqlite' 'traceroute' 'vnstat' 'wireless_tools')
 makedepends=('git' 'meson' 'vala')
 checkdepends=('appstream-glib')
 provides=("${pkgname%-git}")
@@ -20,21 +21,25 @@ source=('git+https://github.com/babluboy/nutty.git')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$srcdir/${pkgname%-git}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	arch-meson "${pkgname%-git}" build
-	meson compile -C build
+  arch-meson "${pkgname%-git}" build
+  meson compile -C build
 }
 
 check() {
-	meson test -C build --print-errorlogs
+  meson test -C build --print-errorlogs
 }
 
 package() {
-	DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 
-	ln -s /usr/bin/com.github.babluboy.nutty "$pkgdir/usr/bin/${pkgname%-git}"
+  ln -s "/usr/bin/$_app_id" "$pkgdir/usr/bin/${pkgname%-git}"
+
+  # Included speedtest-cli script is broken, use system package:
+  rm "$pkgdir/usr/share/$_app_id/scripts/speedtest-cli"
+  ln -s /usr/bin/speedtest-cli "$pkgdir/usr/share/$_app_id/scripts/"
 }