Update to 0.7.16

1 files changed, 15 insertions, 18 deletions

diff --git a/sabnzb/build/sabnzb.SlackBuild b/sabnzb/build/sabnzb.SlackBuild
index ea7249af..a2cdd8a8 100755
--- a/sabnzb/build/sabnzb.SlackBuild
+++ b/sabnzb/build/sabnzb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2014  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -34,6 +34,10 @@
 #             * Initial build.
 # 0.6.0-1:    13/may/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 0.6.7-1:    08/aug/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update.
+# 0.7.16-1:   07/feb/2014 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh sabnzb.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -44,9 +48,9 @@
 # Set initial variables:
 
 PRGNAM=sabnzb
-VERSION=${VERSION:-0.6.0}
+SRCNAM=SABnzbd
+VERSION=${VERSION:-0.7.16}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
 ARCH=noarch
 TAG=${TAG:-alien}
 
@@ -62,7 +66,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/SABnzb-${VERSION}-src.tar.gz"
-SRCURL="http://sourceforge.net/projects/${PRGNAM}dplus/files/${PRGNAM}dplus/${PRGNAM}d-${VERSION}/SABnzbd-${VERSION}-src.tar.gz/download"
+SRCURL="http://sourceforge.net/projects/${PRGNAM}dplus/files/${PRGNAM}dplus/${VERSION}/${SRCNAM}-${VERSION}-src.tar.gz/download"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -88,12 +92,12 @@ rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
 rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
-# Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
     wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
@@ -121,7 +125,7 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -zxvf ${SOURCE}
-cd SABnzbd-${VERSION}
+cd ${SRCNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
@@ -167,12 +171,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \;
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
-fi
-if [ -f $SRCDIR/slack-required ]; then
-  cat $SRCDIR/slack-required > $PKG/install/slack-required
-fi
+cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
@@ -181,9 +180,7 @@ cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
-fi
+cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}