2013-03-22 17:30:08 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
userresources=$HOME/.Xresources
|
|
|
|
usermodmap=$HOME/.Xmodmap
|
|
|
|
sysresources=/etc/X11/xinit/.Xresources
|
|
|
|
sysmodmap=/etc/X11/xinit/.Xmodmap
|
|
|
|
|
|
|
|
# merge in defaults and keymaps
|
|
|
|
|
|
|
|
[ -f $sysresources ] && xrdb -merge $sysresources
|
|
|
|
[ -f $sysmodmap ] && xmodmap $sysmodmap
|
|
|
|
[ -f $userresources ] && xrdb -merge $userresources
|
|
|
|
[ -f $usermodmap ] && xmodmap $usermodmap
|
|
|
|
|
|
|
|
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
|
2014-02-18 09:54:01 +01:00
|
|
|
export DESKTOP_SESSION="mate"
|
2013-03-22 17:30:08 +01:00
|
|
|
exec ck-launch-session dbus-launch --exit-with-session mate-session
|
|
|
|
else
|
2014-02-18 09:54:01 +01:00
|
|
|
export DESKTOP_SESSION="mate"
|
2013-03-22 17:30:08 +01:00
|
|
|
exec mate-session
|
|
|
|
fi
|
|
|
|
|