Release 1.3.5

* fix bug with definition net dev in  old version of net-tools
This commit is contained in:
arcan1s 2013-09-29 00:44:03 +04:00
parent 1f18e2fe67
commit c198b7596a
6 changed files with 31 additions and 29 deletions

View File

@ -3,24 +3,24 @@
pkgname=kdeplasma-applets-pytextmonitor pkgname=kdeplasma-applets-pytextmonitor
_pkgname=py-text-monitor _pkgname=py-text-monitor
pkgver=1.3.4 pkgver=1.3.5
pkgrel=6 pkgrel=1
_dtengine=ext-sysmon _dtengine=ext-sysmon
_dtver=1.2 _dtver=1.2
pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm" pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm"
arch=(any) arch=('i686' 'x86_64')
url="https://github.com/arcan1s/pytextmonitor" url="https://github.com/arcan1s/pytextmonitor"
license=('GPL') license=('GPL')
depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors' 'net-tools') depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors' 'net-tools')
optdepends=("hddtemp: for HDD temperature monitor" optdepends=('hddtemp: for HDD temperature monitor'
"catalyst: for GPU monitor" '775bc3a6057f2dc1696f09b8d315a3e9'
"nvidia-utils: for GPU monitor") '775bc3a6057f2dc1696f09b8d315a3e9')
makedepends=('cmake' 'automoc4') makedepends=('automoc4' 'cmake')
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid 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) https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip)
install=${pkgname}.install install=${pkgname}.install
md5sums=('7cca5fd76735add215f35d406c020dea' md5sums=('d99c8a152693b6b10ebe8fb1a076a333'
'9b547781732ab19ad103710b7bd07d8d') '775bc3a6057f2dc1696f09b8d315a3e9')
build () build ()
{ {
@ -29,18 +29,26 @@ build ()
rm -r ${srcdir}/${_dtengine}/build rm -r ${srcdir}/${_dtengine}/build
fi fi
mkdir ${srcdir}/${_dtengine}/build && cd ${srcdir}/${_dtengine}/build mkdir ${srcdir}/${_dtengine}/build && cd ${srcdir}/${_dtengine}/build
cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` -DCMAKE_BUILD_TYPE=Release ../ cmake -DCMAKE_BUILD_TYPE=Release \
make || return 1 -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
../
make
} }
package() package()
{ {
# install dataengine # install dataengine
cd ${srcdir}/${_dtengine}/build cd ${srcdir}/${_dtengine}/build
make DESTDIR=${pkgdir} install || return 1 make DESTDIR=${pkgdir} install
# install plasmoid # install plasmoid
install -D ${srcdir}/metadata.desktop ${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop || return 1 install -D -m644 ${srcdir}/metadata.desktop \
install -D ${srcdir}/metadata.desktop ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop || return 1 ${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop
cp -r ${srcdir}/contents ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/ || return 1 install -D -m644 ${srcdir}/metadata.desktop \
${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop
mkdir -p ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/{code,ui}
install -m644 ${srcdir}/contents/code/* \
-t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code
install -m644 ${srcdir}/contents/ui/* \
-t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui
} }

Binary file not shown.

View File

@ -11,16 +11,10 @@ EOF
post_upgrade() post_upgrade()
{ {
cat << EOF post_install
Update plasmoids...
EOF
kbuildsycoca4 > /dev/null 2>&1
} }
post_remove() post_remove()
{ {
cat << EOF post_install
Update plasmoids...
EOF
kbuildsycoca4 > /dev/null 2>&1
} }

View File

@ -69,8 +69,8 @@ class pyTextWidget(plasmascript.Applet):
try: try:
interfaces = [] interfaces = []
for line in commands.getoutput("ifconfig -a").split("\n"): for line in commands.getoutput("ifconfig -a").split("\n"):
if ((line != '') and (line[0] != ' ') and (line[0:3] != 'lo:')): if ((line != '') and (line[0] != ' ') and (line.split(":")[0].split()[0] != 'lo')):
interfaces.append(line.split(":")[0]) interfaces.append(line.split(":")[0].split()[0])
for device in interfaces: for device in interfaces:
if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''): if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''):

View File

@ -12,7 +12,7 @@ X-Plasma-RequiredExtensions=LaunchApp,LocalIO,FileDialog
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=py-text-monitor X-KDE-PluginInfo-Name=py-text-monitor
X-KDE-PluginInfo-Version=1.3.4 X-KDE-PluginInfo-Version=1.3.5
X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Website=http://kde-look.org/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=