diff --git a/PKGBUILD b/PKGBUILD index 5422953..dca5494 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=py-text-monitor pkgver=1.5.1 pkgrel=1 _dtengine=ext-sysmon -_dtver=1.3 +_dtver=1.4 pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm" arch=('i686' 'x86_64') url="https://github.com/arcan1s/pytextmonitor" @@ -22,8 +22,8 @@ makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip) install=${pkgname}.install -md5sums=('3ef9536493e48cd460ee3f37faa8cf58' - 'f7fce53d5f616891b30beac1afd99728') +md5sums=('3b384690720bb8315b82c962728f0c5c' + '0d01b624981fdf7b2f69e7f34e942e67') build () { diff --git a/ext-sysmon-1.3.zip b/ext-sysmon-1.3.zip deleted file mode 100644 index 403e0f0..0000000 Binary files a/ext-sysmon-1.3.zip and /dev/null differ diff --git a/ext-sysmon-1.4.zip b/ext-sysmon-1.4.zip new file mode 100644 index 0000000..a570ff9 Binary files /dev/null and b/ext-sysmon-1.4.zip differ diff --git a/ext-sysmon/extsysmon.cpp b/ext-sysmon/extsysmon.cpp index 051efe0..8b4a68e 100644 --- a/ext-sysmon/extsysmon.cpp +++ b/ext-sysmon/extsysmon.cpp @@ -32,7 +32,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args) setMinimumPollingInterval(333); FILE *f_out; - f_out = popen("lspci 2>&1", "r"); + f_out = popen("lspci 2> /dev/null", "r"); char device[256]; QString dev; while (fgets(device, 256, f_out) != NULL) @@ -45,10 +45,10 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args) } pclose(f_out); - f_out = popen("ls -1 /dev/sd[a-z] && ls -1 /dev/hd[a-z] 2>&1", "r"); + f_out = popen("ls -1 /dev/sd[a-z] 2> /dev/null ; ls -1 /dev/hd[a-z] 2> /dev/null", "r"); while (fgets(device, 256, f_out) != NULL) { - dev = QString(device); + dev = QString(device).split("\n")[0]; if (dev[0] == '/') hdddev.append(dev); } diff --git a/ext-sysmon/plasma-engine-extsysmon.desktop b/ext-sysmon/plasma-engine-extsysmon.desktop index 8b41988..9cc5c91 100644 --- a/ext-sysmon/plasma-engine-extsysmon.desktop +++ b/ext-sysmon/plasma-engine-extsysmon.desktop @@ -13,7 +13,7 @@ X-Plasma-EngineName=ext-sysmon X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=ext-sysmon -X-KDE-PluginInfo-Version=1.3 +X-KDE-PluginInfo-Version=1.4 X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL diff --git a/py-text-monitor-1.5.1.plasmoid b/py-text-monitor-1.5.1.plasmoid index 79b1ece..f974f23 100644 Binary files a/py-text-monitor-1.5.1.plasmoid and b/py-text-monitor-1.5.1.plasmoid differ