1 files changed, 17 insertions, 25 deletions
diff --git a/desktop/xdm-slackware-theme/xdm-slackware-theme.SlackBuild b/desktop/xdm-slackware-theme/xdm-slackware-theme.SlackBuild
index b8a9faecb239e..58199a060a0b4 100644
--- a/desktop/xdm-slackware-theme/xdm-slackware-theme.SlackBuild
+++ b/desktop/xdm-slackware-theme/xdm-slackware-theme.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xdm-slackware-theme
 
-# Copyright 2017-2019 Sébastien Ballet France
+# Copyright 2017-2020 Sébastien Ballet France
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,10 @@
 #
 
 PRGNAM=xdm-slackware-theme
-VERSION=${VERSION:-2019.1023}
+VERSION=${VERSION:-2020.0101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 ARCH=noarch
 
 CWD=$(pwd)
@@ -57,19 +58,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p ${PKG}/etc/X11/xdm/slackware
-mkdir -p ${PKG}/etc/X11/xdm/slackware/extensions.d
-mkdir -p ${PKG}/usr/libexec/setxdmbg
-mkdir -p ${PKG}/usr/bin
-mkdir -p ${PKG}/usr/man/man1
-mkdir -p ${PKG}/usr/man/man5
-mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
-
 for SCRIPT in Xbuttons_bar Xreset Xsession Xsetup Xstartup ; do
   cat ${SCRIPT} > ${PKG}/etc/X11/xdm/slackware/${SCRIPT}
 done
 
-cat setxdmbg.sh > ${PKG}/usr/libexec/setxdmbg/setxdmbg.sh
-
+mkdir -p ${PKG}/etc/X11/xdm/slackware/extensions.d
 for EXT in analog-clock sysmon-conky xdm-screensaver ; do
   cat extensions.d/${EXT} > ${PKG}/etc/X11/xdm/slackware/extensions.d/${EXT}
 done
@@ -91,8 +84,13 @@ done
 
 cp -R pixmaps  ${PKG}/etc/X11/xdm/slackware
 
+mkdir -p ${PKG}/usr/libexec/setxdmbg
+cat setxdmbg.sh > ${PKG}/usr/libexec/setxdmbg/setxdmbg.sh
+
+mkdir -p ${PKG}/usr/man/man1
 cat setxdmbg.1             | gzip -9c > ${PKG}/usr/man/man1/setxdmbg.1.gz
 
+mkdir -p ${PKG}/usr/man/man5
 cat Xbuttons_bar.conf.5    | gzip -9c > ${PKG}/usr/man/man5/Xbuttons_bar.conf.5.gz
 cat Xsession.conf.5        | gzip -9c > ${PKG}/usr/man/man5/Xsession.conf.5.gz
 cat Xsetup.conf.5          | gzip -9c > ${PKG}/usr/man/man5/Xsetup.conf.5.gz
@@ -104,33 +102,27 @@ cat xdm-screensaver.conf.5 | gzip -9c > ${PKG}/usr/man/man5/xdm-screensaver.conf
 chmod 755 ${PKG}/etc/X11/xdm/slackware/Xbuttons_bar
 chmod 755 ${PKG}/usr/libexec/setxdmbg/setxdmbg.sh
 
-(
-  cd ${PKG}/usr/bin
-  ln -sf ../libexec/setxdmbg/setxdmbg.sh setxdmbg
-)
+mkdir -p ${PKG}/usr/bin
+ln -sf /usr/libexec/setxdmbg/setxdmbg.sh $PKG/usr/bin/setxdmbg
 
 if [ -e ${PKG}/etc/X11/xdm/slackware/pixmaps/${XDMBGIMG} ] ; then
-  (
-    cd ${PKG}/etc/X11/xdm/slackware/pixmaps
-    ln -sf ${XDMBGIMG} default-wallpaper.pixmap
-  )
+    ln -sf ${XDMBGIMG} ${PKG}/etc/X11/xdm/slackware/pixmaps/default-wallpaper.pixmap ;
 else
   echo "Error: '${XDMBGIMG}' does not exist ..."
   exit 1
 fi
 
-mkdir -p ${PKG}/install
-cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
-cat ${CWD}/doinst.sh  > ${PKG}/install/doinst.sh
-
+mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 for DOC in LICENSE README readme.html setxdmbg.html ; do
   cat ${DOC} > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${DOC}
 done
-
 cp slackware-s-logo.xcf  ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 cp -R adoc               ${PKG}/usr/doc/${PRGNAM}-${VERSION}
-
 cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
 
+mkdir -p ${PKG}/install
+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}