use ck-launch-session ; simplify

This commit is contained in:
Gwenhael Le Moine 2011-01-16 15:01:07 +07:00
parent 0d16f91210
commit f9476814fd

27
xap/awesome/xinitrc.awesome Normal file → Executable file
View file

@ -7,23 +7,16 @@ sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps # merge in defaults and keymaps
[ -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
if [ -f $sysresources ]; then if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
/usr/bin/xrdb -merge $sysresources CK_LAUNCH_SESSION= ck-launch-session
else
CK_LAUNCH_SESSION=
fi 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
[ -x $HOME/.config/awesome/startup.sh ] \ [ -x $HOME/.config/awesome/startup.sh ] \
&& $HOME/.config/awesome/startup.sh \ && exec $CK_LAUNCH_SESSION $HOME/.config/awesome/startup.sh \
|| exec awesome || exec $CK_LAUNCH_SESSION awesome