4 files changed, 76 insertions, 8 deletions
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
index 487542daf..4497e8920 100755
--- a/source/a/aaa_base/aaa_base.SlackBuild
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,11 @@
 #  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)
+
+PKGNAM=aaa_base
 VERSION=14.2
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -33,7 +36,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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-aaa_base
 
@@ -55,6 +65,19 @@ chmod 644 $PKG/etc/slackware-version
 cp -a $CWD/os-release $PKG/etc/os-release
 chown root:root $PKG/etc/os-release
 chmod 644 $PKG/etc/os-release
+# Set $ARCH in PRETTY_NAME:
+sed -i "s/%ARCH%/$ARCH/g" $PKG/etc/os-release
+
+# If this is a -current version, label it as such:
+if [ -r $CWD/current-release ]; then
+  # Read variables:
+  . $CWD/current-release
+  echo "$SLACKWARE_VERSION" > $PKG/etc/slackware-version
+  echo "VERSION_CODENAME=$VERSION_CODENAME" >> $PKG/etc/os-release
+  sed -i "s/PRETTY_NAME=.*/PRETTY_NAME=\"$PRETTY_NAME\"/g" $PKG/etc/os-release
+else
+  echo "VERSION_CODENAME=stable" >> $PKG/etc/os-release
+fi
 
 # Add lib64 directories on x86_64:
 if [ "$ARCH" = "x86_64" ]; then
@@ -65,6 +88,23 @@ fi
 cd $PKG
 makepkg -l y -c n $TMP/aaa_base-$VERSION-$ARCH-$BUILD.txz
 
+# Black box warning on -current label:
+if [ -r $CWD/current-release ]; then
+cat << EOF
+################################################################
+################################################################
+##                                                            ##
+## WARNING: This release is tagged as -current!               ##
+##                                                            ##
+## Before issuing a -stable release, rename current-release   ##
+## to current-release.inactive and then rebuild this package. ##
+##                                                            ##
+################################################################
+################################################################
+EOF
+sleep 5
+fi
+
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
   rm -rf $PKG
diff --git a/source/a/aaa_base/current-release b/source/a/aaa_base/current-release
new file mode 100644
index 000000000..57543bbad
--- /dev/null
+++ b/source/a/aaa_base/current-release
@@ -0,0 +1,28 @@
+# If this file is present and named "current-release" when aaa_base is
+# built, then we will modify the files /etc/slackware-version and
+# /etc/os-release to help users identify that this system is running a
+# -current (test) version of Slackware, rather than the otherwise listed
+# stable release.
+#
+# How useful this will be remains to be seen, because there can be a wide
+# variation in the amount of difference a -current installation has from
+# the previous stable depending on how many updates have been made to it.
+# But, it's probably better than nothing.
+#
+# Change made to /etc/slackware-version:
+#   Append a "+" to indicate -current.
+#
+# Changes made to /etc/os-release:
+#   Add VERSION_CODENAME seen below.
+#   Use the PRETTY_NAME variable seen below.
+#
+# This file will still ship in the build directory of a stable release,
+# but will be renamed "current-release.inactive".
+
+# For /etc/slackware-version:
+SLACKWARE_VERSION="Slackware 14.2+"
+
+# For /etc/os-release:
+VERSION_CODENAME=current
+PRETTY_NAME="Slackware 14.2 $ARCH (post 14.2 -current)"
+
diff --git a/source/a/aaa_base/os-release b/source/a/aaa_base/os-release
index de8afe3bb..13372b5a6 100644
--- a/source/a/aaa_base/os-release
+++ b/source/a/aaa_base/os-release
@@ -2,7 +2,7 @@ NAME=Slackware
 VERSION="14.2"
 ID=slackware
 VERSION_ID=14.2
-PRETTY_NAME="Slackware 14.2"
+PRETTY_NAME="Slackware 14.2 %ARCH%"
 ANSI_COLOR="0;34"
 CPE_NAME="cpe:/o:slackware:slackware_linux:14.2"
 HOME_URL="http://slackware.com/"
diff --git a/source/a/aaa_base/slack-desc b/source/a/aaa_base/slack-desc
index 011f90fb4..1c30763c4 100644
--- a/source/a/aaa_base/slack-desc
+++ b/source/a/aaa_base/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|