summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2020-10-11 09:38:44 -0600
committerMark Wagie2020-10-11 09:38:44 -0600
commitf4773563e66db2d572f8023ffc27db09c796ef15 (patch)
tree01a9ce02ea88b78bb1e7786af0eb31c56c09dcf5
parent6903d0cd4969d5088dc8382e9ee03480d84d8c8b (diff)
downloadaur-f4773563e66db2d572f8023ffc27db09c796ef15.tar.gz
use setup.py
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD23
-rwxr-xr-xsysmon.desktop2
-rw-r--r--sysmon.sh3
4 files changed, 16 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8d9e14d8907..f360bfc8147 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
pkgbase = sysmon-git
pkgdesc = Graphical system monitor. Similar to windows task manager.
- pkgver = 0.9.r21.g56cb167
+ pkgver = 1.0.r0.g2f1b9f5
pkgrel = 1
url = https://github.com/MatthiasSchinzel/sysmon
arch = any
- license = GPL
+ license = GPL3
+ makedepends = python-setuptools
depends = python-pyqtgraph
depends = python-pyqt5
depends = wireless_tools
@@ -13,10 +14,8 @@ pkgbase = sysmon-git
conflicts = sysmon
source = git+https://github.com/MatthiasSchinzel/sysmon.git
source = sysmon.desktop
- source = sysmon.sh
sha256sums = SKIP
- sha256sums = 3f692c5a3cb16bcc2fa95c7b18392d45e4c08d575fcab8590679efcdb56b70ac
- sha256sums = 4695bfb1a3305725b3f575bcba9fac88aa1c1c828439d3bb2008c7f008938a32
+ sha256sums = cc538ea1e439738db3fedf55ef0ab825e27669b8501f99ac58be7245f974bc7e
pkgname = sysmon-git
diff --git a/PKGBUILD b/PKGBUILD
index 242275e1ffa..605230ac0c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,35 @@
# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
pkgname=sysmon-git
-pkgver=0.9.r21.g56cb167
+pkgver=1.0.r0.g2f1b9f5
pkgrel=1
pkgdesc="Graphical system monitor. Similar to windows task manager."
arch=('any')
url="https://github.com/MatthiasSchinzel/sysmon"
-license=('GPL')
+license=('GPL3')
depends=('python-pyqtgraph' 'python-pyqt5' 'wireless_tools')
+makedepends=('python-setuptools')
optdepends=('nvidia-utils: NVIDIA GPU utilization and clock speed')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=('git+https://github.com/MatthiasSchinzel/sysmon.git'
- "${pkgname%-git}.desktop"
- "${pkgname%-git}.sh")
+ "${pkgname%-git}.desktop")
sha256sums=('SKIP'
- '3f692c5a3cb16bcc2fa95c7b18392d45e4c08d575fcab8590679efcdb56b70ac'
- '4695bfb1a3305725b3f575bcba9fac88aa1c1c828439d3bb2008c7f008938a32')
+ 'cc538ea1e439738db3fedf55ef0ab825e27669b8501f99ac58be7245f974bc7e')
pkgver() {
cd "$srcdir/${pkgname%-git}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd "$srcdir/${pkgname%-git}"
- sed -i '1s/^/#!\/usr\/bin\/env python\n/' "src/${pkgname%-git}.py"
+build() {
+ cd "$srcdir/${pkgname%-git}/src"
+ python setup.py build
}
package() {
- cd "$srcdir/${pkgname%-git}"
- install -Dm644 src/{*.py,*.ui} -t "$pkgdir/opt/${pkgname%-git}"
- install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
+ cd "$srcdir/${pkgname%-git}/src"
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+
install -Dm644 "$srcdir/${pkgname%-git}.desktop" -t \
"$pkgdir/usr/share/applications"
}
diff --git a/sysmon.desktop b/sysmon.desktop
index f57f9cd6440..e6115978c0e 100755
--- a/sysmon.desktop
+++ b/sysmon.desktop
@@ -3,7 +3,7 @@ Type=Application
Icon=utilities-system-monitor
Name=SysMonitor
GenericName=Graphical system monitor
-Exec=python /opt/sysmon/sysmon.py
+Exec=sysmon
Terminal=false
Hidden=false
Categories=Utility;
diff --git a/sysmon.sh b/sysmon.sh
deleted file mode 100644
index 649fc231683..00000000000
--- a/sysmon.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-python /opt/sysmon/sysmon.py