1 files changed, 29 insertions, 11 deletions
diff --git a/system/icingaweb2/icingaweb2.SlackBuild b/system/icingaweb2/icingaweb2.SlackBuild
index 5ec8c94539..6d0338d7ce 100644
--- a/system/icingaweb2/icingaweb2.SlackBuild
+++ b/system/icingaweb2/icingaweb2.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for icingaweb2
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2022  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,27 @@
 #  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=icingaweb2
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+IPLVER=${IPLVER:-0.8.1}
+IPTVER=${IPTVER:-0.10.0}
 
 ARCH=noarch
 
-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}
@@ -56,16 +69,24 @@ find -L . \
 
 # Manual install
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX}/php,share/$PRGNAM/library} \
-  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/log/$PRGNAM
+  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/{lib,log}/$PRGNAM \
+  $PKG/usr/share/bash-completion/completions
 cp -a application modules public $PKG/usr/share/$PRGNAM
 cp -a library/Icinga $PKG/usr/lib${LIBDIRSUFFIX}/php
 cp -a library/vendor $PKG/usr/share/$PRGNAM/library
-cp -a etc/bash_completion.d $PKG/etc
+cp -a etc/bash_completion.d/* $PKG/usr/share/bash-completion/completions/
 cp -a packages/files/apache/$PRGNAM.conf $PKG/etc/httpd/extra/$PRGNAM.conf
 cp -a packages/files/config/modules/setup $PKG/etc/$PRGNAM/modules
 cp -a packages/files/public/index.php $PKG/usr/share/$PRGNAM/public
 cp -a packages/files/bin/icingacli $PKG/usr/bin
 
+# Required modules
+mkdir -p $PKG/usr/share/icinga-php/{ipl,vendor}
+tar xf $CWD/icinga-php-library-${IPLVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/ipl
+tar xf $CWD/icinga-php-thirdparty-${IPTVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/vendor
+
 # Change default paths
 sed -i "s#usr/share/doc/$PRGNAM/schema#usr/doc/$PRGNAM-$VERSION/schema#" \
   $PKG/etc/$PRGNAM/modules/setup/config.ini
@@ -75,11 +96,8 @@ sed -i "s#usr/share/php#usr/lib${LIBDIRSUFFIX}/php#" $PKG/usr/bin/icingacli \
 # Append .new to configs
 find $PKG/etc/httpd/extra $PKG/etc/$PRGNAM -type f -exec mv {} {}.new \;
 
-# Generate setup token
-head -c 12 /dev/urandom | base64 | tee $PKG/etc/$PRGNAM/setup.token
-
 # Apache needs permissions
-chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/log/$PRGNAM
+chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/{lib,log}/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* etc/schema $PKG/usr/doc/$PRGNAM-$VERSION
@@ -90,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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