summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-12-07 09:15:56 +0100
committer Eric Hameleers <alien@slackware.com>2020-12-07 09:15:56 +0100
commitf61fc62f8d9155effe6cf348499280c73b080db5 (patch)
treefe3fb24c2ba704e84f04f2e0d2d61de6a66d6898
parenta0412ed4ee30ff1267f9f849a68b4a14fc9826a1 (diff)
downloadliveslak-f61fc62f8d9155effe6cf348499280c73b080db5.tar.gz
liveslak-f61fc62f8d9155effe6cf348499280c73b080db5.tar.xz
Prepare for inclusion of Plasma5 into Slackware
Like with KDE4, apply the Plasma5 related configuration only (and always) in case a Plasma5 installation is detected. This de-couples it from supporting only specific variants like PLASMA5 or DAW, because SLACKWARE will include Plasma5 as well.
Diffstat (limited to '')
-rwxr-xr-xmake_slackware_live.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index e4151e7..549531c 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -2170,10 +2170,11 @@ EOT
fi # End KDE4
-if [ "$LIVEDE" = "PLASMA5" -o "$LIVEDE" = "DAW" ]; then
+# Only configure for Plasma5 if it is actually installed:
+if [ -d ${LIVE_ROOTDIR}/usr/lib${DIRSUFFIX}/kf5 ]; then
# -------------------------------------------------------------------------- #
- echo "-- Configuring PLASMA5/DAW."
+ echo "-- Configuring Plasma5."
# -------------------------------------------------------------------------- #
# This section is for any Plasma5 based variant.
@@ -2306,7 +2307,7 @@ text/html=kwebkitpart.desktop;
EOT
fi
-fi # End LIVEDE = PLASMA5/DAW
+fi # End Plasma5
if [ "$LIVEDE" = "DLACK" ]; then
@@ -2631,9 +2632,9 @@ echo "-- Tweaking system startup."
if [ "$LIVEDE" = "SLACKWARE" ]; then
ln -sf xinitrc.kde ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
elif [ "$LIVEDE" = "DAW" ]; then
- ln -sf xinitrc.plasma ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
+ ln -sf xinitrc.kde ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
elif [ "$LIVEDE" = "PLASMA5" ]; then
- ln -sf xinitrc.plasma ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
+ ln -sf xinitrc.kde ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
elif [ "$LIVEDE" = "MATE" ]; then
ln -sf xinitrc.mate-session ${LIVE_ROOTDIR}/etc/X11/xinit/xinitrc
elif [ "$LIVEDE" = "CINNAMON" ]; then