summaryrefslogtreecommitdiffstats
path: root/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-10-06 23:36:02 +0200
committer Eric Hameleers <alien@slackware.com>2019-10-06 23:36:02 +0200
commit55bb52de959214602121867d55723cf27d7684a7 (patch)
tree62a82ef1ea1b67e72068d2e96583fe25594fbff4 /kde/post-install/plasma-workspace/xinit/xinitrc.plasma
parent57ec3da3a54f8380517de0b37f42be75ef04a307 (diff)
downloadktown-55bb52de959214602121867d55723cf27d7684a7.tar.gz
ktown-55bb52de959214602121867d55723cf27d7684a7.tar.xz
Add support for building Plasma5 on a PAM-ified Slackwarepam
Set the variable SLACKPAM to "yes" in kde/kde.options if you want to add support for PAM. These packages will be supplied by a pam-ified Slackware, so they should not be installed from 'ktown': deps:ConsoleKit2,cracklib These packages will react to SLACKPAM variable setting: plasma:kscreenlocker,plasma-workspace plasma-extra:sddm-qt5 Uncomment in kde/modules/plasma and compile: plasma:kwallet-pam
Diffstat (limited to 'kde/post-install/plasma-workspace/xinit/xinitrc.plasma')
-rw-r--r--kde/post-install/plasma-workspace/xinit/xinitrc.plasma18
1 files changed, 12 insertions, 6 deletions
diff --git a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
index ff3c8a1..e70c281 100644
--- a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
+++ b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
@@ -9,24 +9,30 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -f $sysresources ]; then
- xrdb -merge $sysresources
+ xrdb -merge $sysresources
fi
if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
+ xmodmap $sysmodmap
fi
if [ -f $userresources ]; then
- xrdb -merge $userresources
+ xrdb -merge $userresources
fi
if [ -f $usermodmap ]; then
- xmodmap $usermodmap
+ xmodmap $usermodmap
fi
# Start the window manager:
+if which startplasma-x11 1>/dev/null 2>/dev/null ; then
+ START_KDE=startplasma-x11
+else
+ START_KDE=startkde
+fi
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
+ ck-launch-session dbus-launch --sh-syntax --exit-with-session $START_KDE
else
- dbus-launch --sh-syntax --exit-with-session startkde
+ dbus-launch --sh-syntax --exit-with-session $START_KDE
fi
+