diff options
author | Philip Lacroix <philnx at posteo dot de> | 2015-05-23 22:43:30 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-05-23 22:43:30 +0700 |
commit | eb4acbfd86e55104290a1f91b6217f29601021bd (patch) | |
tree | 2e04dac687fc7e4719dd0228025c0f4bd070eab6 /system | |
parent | 76726771cb8f34ef5e017edca08bc985847e037d (diff) | |
download | slackbuilds-eb4acbfd86e55104290a1f91b6217f29601021bd.tar.gz |
system/glances: Updated for version 2.4.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r-- | system/glances/README | 32 | ||||
-rw-r--r-- | system/glances/doinst.sh | 11 | ||||
-rw-r--r-- | system/glances/glances.SlackBuild | 27 | ||||
-rw-r--r-- | system/glances/glances.info | 6 |
4 files changed, 30 insertions, 46 deletions
diff --git a/system/glances/README b/system/glances/README index 98d76f3133..15ef766369 100644 --- a/system/glances/README +++ b/system/glances/README @@ -1,11 +1,10 @@ Glances is a free (LGPL) cross-platform curses-based system monitoring tool which aims to present a maximum of information in a minimum of space, ideally -to fit in a classical 80x24 terminal, or larger for additional data: in fact -it can adapt dynamically the displayed information depending on the terminal -size. +to fit in a classical 80x24 terminal, or larger for additional data as it can +adapt the displayed information dynamically, depending on the terminal size. -This tool can also work in client/server mode. Remote monitoring can be -done via terminal or web interface. +This tool can also work in client/server mode. Remote monitoring can be done +via terminal or web interface. Glances is written in Python and uses the psutil library to fetch statistical values from key elements, like CPU, load average, memory, network, disks, @@ -13,20 +12,19 @@ file systems, processes, etc. OPTIONAL DEPENDENCIES -Available on SBo: hddtemp (HHD temperature monitoring support), py3sensors -(HW monitoring support), batinfo (battery monitoring support), bottle (Web -server mode), pymdstat (RAID support), ysnmp (SNMP support), netifaces (auto -discoverer mode), statsd (StatsD export module), matplotlib (generation of -graphs from history data) and python3. +Available on SBo: batinfo (battery monitoring support), bottle (Web server +mode), hddtemp (HHD temperature monitoring support), matplotlib (generation +of graphs from history data), netifaces (auto discoverer mode), py3sensors +(HW monitoring support), pymdstat (RAID support), python3, statsd (StatsD +export module), ysnmp (SNMP support). -Not available on SBo: influxdb (InfluxDB export module), pystache (action -script feature), docker-py (Docker monitoring support), zeroconf (auto -discoverer mode). +Not available on SBo: docker-py (Docker monitoring support), influxdb (InfluxDB +export module), pika (RabbitMQ/ActiveMQ export module), pystache (action script +feature), zeroconf (auto discoverer mode). NOTES -1) When launching Glances in a terminal with a bright background, the -option '--theme-white' is recommended. +1) When launching Glances in a terminal with a bright background, the option +'--theme-white' is recommended. -2) For the optional auto discoverer mode, both zeroconf and netifaces -are needed. +2) For optional auto discoverer mode, both zeroconf and netifaces are needed. diff --git a/system/glances/doinst.sh b/system/glances/doinst.sh deleted file mode 100644 index d1bde8d89b..0000000000 --- a/system/glances/doinst.sh +++ /dev/null @@ -1,11 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - rm $NEW - fi -} - -config etc/glances/glances.conf.new diff --git a/system/glances/glances.SlackBuild b/system/glances/glances.SlackBuild index b584404c41..6e5959dc48 100644 --- a/system/glances/glances.SlackBuild +++ b/system/glances/glances.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glances -VERSION=${VERSION:-2.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.4.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -47,8 +47,8 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -# The upstream tarball will be named differently, depending on the file -# being downloaded manually (web browser) or with wget. +# The upstream tarball will be named differently, depending on +# the file being downloaded manually (web browser) or with wget. if [ -e $CWD/v$VERSION.tar.gz ]; then tar xvzf $CWD/v$VERSION.tar.gz else @@ -63,11 +63,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; -PRGUSR=$PKG/usr -PRGSHR=$PKG/usr/share -PRGETC=$PKG/etc/$PRGNAM -PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION - python setup.py install --root=$PKG # Python 3 support. @@ -79,20 +74,22 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null \ || true -# Don't mess with existing config files. -mv $PRGETC/$PRGNAM.conf $PRGETC/$PRGNAM.conf.new +PRGUSR=$PKG/usr +PRGSHR=$PKG/usr/share +PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION -mv $PRGSHR/man $PKG/usr/ -gzip -9 $PRGUSR/man/man?/*.? +# Compress man page. +mv $PRGSHR/man $PRGUSR/ +gzip -9 $PRGUSR/man/man1/$PRGNAM.1 +# Install documentation. mkdir -p $PRGDOC mv $PRGSHR/doc/$PRGNAM/* $PRGDOC/ -rm -rf $PRGSHR cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild +rm -rf $PRGSHR mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/glances/glances.info b/system/glances/glances.info index f20fa669b8..7a96ff29f0 100644 --- a/system/glances/glances.info +++ b/system/glances/glances.info @@ -1,8 +1,8 @@ PRGNAM="glances" -VERSION="2.3" +VERSION="2.4.1" HOMEPAGE="https://github.com/nicolargo/glances" -DOWNLOAD="https://github.com/nicolargo/glances/archive/v2.3.tar.gz" -MD5SUM="19c2c02c4f8768867ec18ada23cb81c2" +DOWNLOAD="https://github.com/nicolargo/glances/archive/v2.4.1.tar.gz" +MD5SUM="e469f8bb8c5a1b0b2a38402b911134ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="psutil pysetuptools" |