1 files changed, 11 insertions, 12 deletions
diff --git a/system/glances/glances.SlackBuild b/system/glances/glances.SlackBuild
index f1acfd3ccc..3ecfcb2320 100644
--- a/system/glances/glances.SlackBuild
+++ b/system/glances/glances.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for glances
 
-# Copyright 2013-2015 Philip Lacroix <slackph at posteo dot de>
+# Copyright 2013-2017 Philip Lacroix <slackph at posteo dot de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glances
-VERSION=${VERSION:-2.5.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.8.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,14 +46,7 @@ rm -rf $PKG
 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.
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  tar xvzf $CWD/v$VERSION.tar.gz
-else
-  tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
+tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -68,6 +61,7 @@ python setup.py install --root=$PKG
 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
 
+PRGETC=$PKG/etc
 PRGUSR=$PKG/usr
 PRGSHR=$PKG/usr/share
 PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
@@ -76,6 +70,10 @@ PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mv $PRGSHR/man $PRGUSR/
 gzip -9 $PRGUSR/man/man1/$PRGNAM.1
 
+# Safely install configuration file.
+mkdir $PRGETC
+mv $PRGSHR/doc/$PRGNAM/$PRGNAM.conf $PRGETC/$PRGNAM.conf.new
+
 # Install documentation.
 mkdir -p $PRGDOC
 mv $PRGSHR/doc/$PRGNAM/* $PRGDOC/
@@ -84,6 +82,7 @@ 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}