desktop/dunst: fix download url, plus some script clean ups

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 10 insertions, 9 deletions

diff --git a/desktop/dunst/dunst.SlackBuild b/desktop/dunst/dunst.SlackBuild
index 0ca362d1fe..6f2ca6f49f 100644
--- a/desktop/dunst/dunst.SlackBuild
+++ b/desktop/dunst/dunst.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014, Simon Bolokanov, Bulgaria
+# Copyright (c) 2014, Симон Болоканов, България
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,11 @@
 # changelog:
 #    v1.0.0 - Simon Bolokanov
 #    v1.1.0 - revised for SBo - 09.10.2014
+#     15.3.2015 - main site is down, fixed download url. Made some script clean ups
 
 PRGNAM=dunst
 VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,7 +73,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Change config dir to Slackware specification
+# Change config dir to appropriate location
 sed -i 's,${PREFIX}/share/dunst,/etc/xdg/dunst,' Makefile
 
 CFLAGS="$SLKCFLAGS" \
@@ -89,7 +90,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG INSTALL LICENSE README* RELEASE_NOTES* VERSION docs/* \
+cp -a AUTHORS CHANGELOG INSTALL LICENSE docs/dunst_explainations.png \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/dunst/dunst.info b/desktop/dunst/dunst.info
index 7bf13ce78e..70f69b81e5 100644
--- a/desktop/dunst/dunst.info
+++ b/desktop/dunst/dunst.info
@@ -1,8 +1,8 @@
 PRGNAM="dunst"
 VERSION="1.1.0"
-HOMEPAGE="http://www.knopwob.org/dunst/"
-DOWNLOAD="http://knopwob.org/public/dunst-release/dunst-1.1.0.tar.bz2"
-MD5SUM="7c37fb5306012fd658839908479dbbed"
+HOMEPAGE="http://knopwob.de/dunst/"
+DOWNLOAD="https://github.com/knopwob/dunst/archive/v1.1.0.tar.gz"
+MD5SUM="b44c0cb8ed62e3d1d1bc899615170f3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxdg-basedir"
diff --git a/desktop/dunst/slack-desc b/desktop/dunst/slack-desc
index bb189ace80..59088d3bd4 100644
--- a/desktop/dunst/slack-desc
+++ b/desktop/dunst/slack-desc
@@ -14,6 +14,6 @@ dunst: It's very customizable, doesn't depend on any toolkits and therefore
 dunst: fits in those windowmanager centric setups we all love to customize
 dunst: to perfection.
 dunst:
-dunst: Homepage: http://www.knopwob.org/dunst/
+dunst: Homepage: http://knopwob.de/dunst/
 dunst:
 dunst: