3 files changed, 19 insertions, 9 deletions
diff --git a/development/avr8-gnu-toolchain/README b/development/avr8-gnu-toolchain/README
index 7793f3e019..75fea75a6d 100644
--- a/development/avr8-gnu-toolchain/README
+++ b/development/avr8-gnu-toolchain/README
@@ -1,6 +1,6 @@
 Atmel AVR Toolchain is a collection of tools/libraries used to create
-applications for AVR microcontrollers. This collection includes compiler,
-assembler, linker and Standard C & math libraries.
+applications for AVR microcontrollers. This collection includes
+compiler, assembler, linker and Standard C & math libraries.
 
 This script builds a Slackware package from the official binary
 distributed by Atmel. The source code is available at:
diff --git a/development/avr8-gnu-toolchain/avr8-gnu-toolchain.SlackBuild b/development/avr8-gnu-toolchain/avr8-gnu-toolchain.SlackBuild
index 8f8f130ad7..baea46b245 100644
--- a/development/avr8-gnu-toolchain/avr8-gnu-toolchain.SlackBuild
+++ b/development/avr8-gnu-toolchain/avr8-gnu-toolchain.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AVR 8-bit GNU Toolchain.
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=avr8-gnu-toolchain
 VERSION=${VERSION:-3.4.1.798}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/avr8-gnu-toolchain/avr8-gnu-toolchain.info b/development/avr8-gnu-toolchain/avr8-gnu-toolchain.info
index a5581d0f6e..0dd9119afc 100644
--- a/development/avr8-gnu-toolchain/avr8-gnu-toolchain.info
+++ b/development/avr8-gnu-toolchain/avr8-gnu-toolchain.info
@@ -1,12 +1,12 @@
 PRGNAM="avr8-gnu-toolchain"
 VERSION="3.4.1.798"
 HOMEPAGE="http://www.atmel.com/"
-DOWNLOAD="http://www.atmel.com/Images/avr8-gnu-toolchain-3.4.1.798-linux.any.x86.tar.gz \
-          http://www.atmel.com/Images/avr8-gnu-toolchain-3.4.1.798-readme.pdf"
+DOWNLOAD="https://slackware.uk/~urchlay/src/avr8-gnu-toolchain-3.4.1.798-linux.any.x86.tar.gz \
+          https://slackware.uk/~urchlay/src/avr8-gnu-toolchain-3.4.1.798-readme.pdf"
 MD5SUM="2bedb2fa23f3f27b5b0b86d20dacc492 \
         5b55c062e88430fca9e342b34e31cc5f"
-DOWNLOAD_x86_64="http://www.atmel.com/Images/avr8-gnu-toolchain-3.4.1.798-linux.any.x86_64.tar.gz \
-                 http://www.atmel.com/Images/avr8-gnu-toolchain-3.4.1.798-readme.pdf"
+DOWNLOAD_x86_64="https://slackware.uk/~urchlay/src/avr8-gnu-toolchain-3.4.1.798-linux.any.x86_64.tar.gz \
+                 https://slackware.uk/~urchlay/src/avr8-gnu-toolchain-3.4.1.798-readme.pdf"
 MD5SUM_x86_64="587573e4fa6ce0f2fe1b9cf0b4bfb744 \
                5b55c062e88430fca9e342b34e31cc5f"
 REQUIRES="%README%"