summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2020-03-31 12:10:02 -0600
committerMark Wagie2020-03-31 12:10:02 -0600
commitfe36110171e042a3c3bc454ef4178f7d3a97fbef (patch)
tree8f6b09f3e89fea250ff9bc486444b0e96a939aff
parent19e5c1a747ef1d57ef43098d898a9bbb3823d00a (diff)
downloadaur-fe36110171e042a3c3bc454ef4178f7d3a97fbef.tar.gz
PKGBUILD rewrite
-rw-r--r--.SRCINFO26
-rw-r--r--[-rwxr-xr-x]PKGBUILD48
-rw-r--r--[-rwxr-xr-x]nutty.install30
3 files changed, 56 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49a0a8dc3a5..91455d39e3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,33 @@
pkgbase = nutty-git
- pkgdesc = A network utility for linux. Monitor the devices on your network and check bandwidth and speed details.
- pkgver = 120.8af2d4a
+ pkgdesc = A network utility that monitors the devices on your network, checks bandwidth and speed details.
+ pkgver = 1.1.1.r29.g56f5996
pkgrel = 1
url = https://github.com/babluboy/nutty
install = nutty.install
arch = i686
arch = x86_64
license = GPL3
- makedepends = vala
makedepends = git
makedepends = meson
- depends = gtk3
+ makedepends = vala
+ makedepends = appstream
depends = granite
- depends = sqlite
- depends = libxml2
depends = libnotify
+ depends = libxml2
depends = libgee
- provides = nutty-git
- conflicts = nutty-git
+ depends = sqlite
+ depends = net-tools
+ depends = nethogs
+ depends = nmap
+ depends = traceroute
+ depends = vnstat
+ depends = wireless_tools
+ depends = iproute2
+ depends = pciutils
+ provides = nutty
+ conflicts = nutty
source = git+https://github.com/babluboy/nutty.git
- sha256sums = SKIP
+ md5sums = SKIP
pkgname = nutty-git
diff --git a/PKGBUILD b/PKGBUILD
index e76c0b2597a..c9c34266d18 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,35 @@
-# Maintainer: Marcin Tydelski <marcin.tydelski@gmail.com>
-# Contributor: Siddhartha Das <https://github.com/babluboy, bablu.boy@gmail.com>
-
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: Marcin Tydelski <marcin.tydelski@gmail.com>
+# Contributor: Siddhartha Das bablu.boy@gmail.com>
pkgname=nutty-git
-pkgver=120.8af2d4a
+pkgver=1.1.1.r29.g56f5996
pkgrel=1
-_gitname=nutty
-pkgdesc='A network utility for linux. Monitor the devices on your network and check bandwidth and speed details.'
+pkgdesc='A network utility that monitors the devices on your network,
+ checks bandwidth and speed details.'
arch=('i686' 'x86_64')
url='https://github.com/babluboy/nutty'
license=('GPL3')
-depends=('gtk3' 'granite' 'sqlite' 'libxml2' 'libnotify' 'libgee')
-optdepends=()
-makedepends=('vala' 'git' 'meson')
-provides=("${pkgname%}")
-conflicts=("${pkgname%}")
-install="${pkgname%-*}.install"
+depends=('granite' 'libnotify' 'libxml2' 'libgee' 'sqlite' 'net-tools' 'nethogs'
+ 'nmap' 'traceroute' 'vnstat' 'wireless_tools' 'iproute2' 'pciutils')
+makedepends=('git' 'meson' 'vala' 'appstream')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+install="${pkgname%-git}.install"
source=('git+https://github.com/babluboy/nutty.git')
-sha256sums=('SKIP')
+md5sums=('SKIP')
pkgver() {
- cd $_gitname
- echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-prepare() {
- cd $srcdir/$_gitname
- git submodule init; git submodule update
+ cd "$srcdir/${pkgname%-git}"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- mkdir -p $srcdir/$_gitname/build
- cd $srcdir/$_gitname/build
- arch-meson
- ninja
+ arch-meson "${pkgname%-git}" build
+ ninja -C build
}
package() {
- cd $srcdir/$_gitname/build
- DESTDIR=${pkgdir} ninja install
-}
+ DESTDIR="$pkgdir" ninja -C build install
-# vim: ts=2 sw=2 et:
+ ln -s /usr/bin/com.github.babluboy.nutty "$pkgdir/usr/bin/${pkgname%-git}"
+}
diff --git a/nutty.install b/nutty.install
index 826f632e9bf..4f1293b0549 100755..100644
--- a/nutty.install
+++ b/nutty.install
@@ -1,16 +1,24 @@
post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ echo -e "*****************************************************"
+ echo -e "* *"
+ echo -e "* Sometimes vnstat is not started upon install, *"
+ echo -e "* use the appropriate init system command *"
+ echo -e "* to start vnstat daemon; i.e., *"
+ echo -e "* *"
+ echo -e "* systemctl enable vnstat --now *"
+ echo -e "* *"
+ echo -e "*****************************************************"
+ echo -e -n ""
}
post_remove() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ echo -e "*****************************************************"
+ echo -e "* *"
+ echo -e "* If vnstat is no longer neeeded, *"
+ echo -e "* you may remove it or disable the service *"
+ echo -e "* *"
+ echo -e "* systemctl stop vnstat && systemctl disable vnstat *"
+ echo -e "* *"
+ echo -e "*****************************************************"
+ echo -e -n ""
}
-
-# vim: ts=2 sw=2 et: \ No newline at end of file