summaryrefslogtreecommitdiff
path: root/desktop/openbox/xinitrc.openbox
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/openbox/xinitrc.openbox')
-rw-r--r--desktop/openbox/xinitrc.openbox27
1 files changed, 10 insertions, 17 deletions
diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox
index 483649b650..4ab1df40b6 100644
--- a/desktop/openbox/xinitrc.openbox
+++ b/desktop/openbox/xinitrc.openbox
@@ -7,22 +7,10 @@ sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
- /usr/bin/xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
- /usr/bin/xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
- /usr/bin/xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
- /usr/bin/xmodmap $usermodmap
-fi
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
# Create default user directory & populate it if not already existent
if [ ! -d $HOME/.config/openbox ]; then
@@ -31,4 +19,9 @@ if [ ! -d $HOME/.config/openbox ]; then
cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
fi
-exec openbox
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session openbox
+else
+ exec openbox
+fi
+