summaryrefslogtreecommitdiffstats
path: root/kde/post-install/plasma-workspace/xinit
diff options
context:
space:
mode:
Diffstat (limited to 'kde/post-install/plasma-workspace/xinit')
-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
+