1 files changed, 19 insertions, 38 deletions
diff --git a/academic/pyCRAC/pyCRAC.SlackBuild b/academic/pyCRAC/pyCRAC.SlackBuild
index bf5735f064..038db738b1 100644
--- a/academic/pyCRAC/pyCRAC.SlackBuild
+++ b/academic/pyCRAC/pyCRAC.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pyCRAC
 
-# Copyright 2017 Rob van Nues
+# Copyright 2017-2023 Rob van Nues
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,23 +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=pyCRAC
-VERSION=${VERSION:-1.4.4}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-# pyCRAC works with python2 as well as python3;
-# Note that python2 is being phased out; therefore python3 is set as default.
-# This is the same for the python pyCrac dependencies
-
-#set which python version to install it for
-PYTHON2=false
-PYTHON3=true
-
-
-PIPENAM=kinetic_crac_pipeline
-PIPEVER=${PIPEVER:-ffe91cc6bf7a}
-PIPETAG=sgrann
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,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}
@@ -73,20 +70,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -rf $PIPETAG-$PIPENAM-$PIPEVER
 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-mkdir $PRGNAM/$PIPENAM
-
-if [[ -f $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
-elif [[ -f $CWD/$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
-fi
 
 #replace setup.py; test.sh
-rm setup.py
+mv setup.py setup.py.ORIG
 cp $CWD/setup_slack.py setup.py
 rm tests/test.sh
 cp $CWD/test_slack.sh tests/test.sh
@@ -98,32 +87,24 @@ 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 {} \;
 
-if $PYTHON2; then
-   python setup.py install --root=$PKG
-fi
-if $PYTHON3; then
-  python3 setup.py install --root=$PKG
-fi
+python3 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
 
-# The pipeline-R script
-mkdir -p $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-cp $PRGNAM/$PIPENAM/gaussianProcessAnalysis.R $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-
 # the manual etc.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README.md \
+  setup.py.ORIG \
+  The_pyCRAC_Manual.pdf \
   $CWD/README.tests $CWD/setup_slack.py \
   $CWD/README \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PRGNAM/$PIPENAM/README.md $PKG/usr/doc/$PRGNAM-$VERSION/$PIPENAM-README.md
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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