2010-05-11 20:00:07 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
userresources=$HOME/.Xresources
|
|
|
|
usermodmap=$HOME/.Xmodmap
|
2010-05-13 00:22:46 +02:00
|
|
|
sysresources=/etc/X11/xinit/.Xresources
|
|
|
|
sysmodmap=/etc/X11/xinit/.Xmodmap
|
2010-05-11 20:00:07 +02:00
|
|
|
|
|
|
|
# Merge in defaults and keymaps
|
|
|
|
test -f $sysresources && xrdb -merge $sysresources
|
|
|
|
test -f $sysmodmap && xmodmap $sysmodmap
|
|
|
|
test -f $userresources && xrdb -merge $userresources
|
|
|
|
test -f $usermodmap && xmodmap $usermodmap
|
|
|
|
|
2010-12-21 03:52:49 +01:00
|
|
|
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
|
2012-08-01 19:46:36 +02:00
|
|
|
exec ck-launch-session dbus-launch --exit-with-session ion3
|
2010-06-15 10:03:27 +02:00
|
|
|
else
|
|
|
|
exec ion3
|
|
|
|
fi
|
|
|
|
|